gentoo resync : 04.05.2021

249 files changed, 3401 insertions, 2168 deletions

diff --git a/dev-python/Babel/Babel-2.8.1.ebuild b/dev-python/Babel/Babel-2.8.1.ebuild
deleted file mode 100644
index 59a1c0b8d639..000000000000
--- a/dev-python/Babel/Babel-2.8.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/Babel-2.8.0-py39.patch
-	"${FILESDIR}"/Babel-2.9.0-pypy3.patch
-)
-
-src_test() {
-	local -x TZ=UTC
-	distutils-r1_src_test
-}
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.1.ebuild
index 55fd72ae8906..7dd2c3755132 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.1.ebuild
@@ -20,18 +20,17 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_{6..8} pypy3)"
-DEPEND="${DEPEND}
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+	' python3_{7..8} pypy3)"
+BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
-PATCHES=(
-	"${FILESDIR}"/Babel-2.9.0-pypy3.patch
-)
-
-src_test() {
+python_test() {
 	local -x TZ=UTC
-	distutils-r1_src_test
+	local deselect=()
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/messages/test_extract.py::ExtractPythonTestCase::test_extract_strip_comment_tags
+	)
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 3954e1dfd3da..cc7fb647bef8 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,7 +1,3 @@
-AUX Babel-2.8.0-py39.patch 7421 BLAKE2B 94a9b55504214b4c422cab61651dcc4c9192f438635e0ec6aa77ea1b53fefb782dd4a1d13ba89500fc2c2e13bebfc616529aaf74c18a55304fd23c2c53fb77cc SHA512 8d738bb0140c80bb2db8a2180c563f61500df42de1b69f0b2a36dea23aad889fe59451fca993161f6ca6a2f6006d98ce94ab139eb5be4a1a25f43e922e3fc9de
-AUX Babel-2.9.0-pypy3.patch 1130 BLAKE2B 23abff434e982c8d8f8350c599b3b94ee07775e7244ce26f9bdd1d91b00ca0f25c03ee2b52b466b42de10036ad2004b6bfc53a1abf10bc328f5ad98a48604078 SHA512 8cae713129f7fb87d22b7cd5f5eb196a2f8990f83141bc9617f79b3e9c56e1873e1d74adaec79b4bacf0c6a7d721fb9ce5cd747fef355a55a1e518b94536d978
-DIST Babel-2.8.1.tar.gz 8471453 BLAKE2B bc2e66a3c1c77e5b190cdb3f53d149268b6f49adde3040cbe6a3dd8eb98f6caffb3988232e76083e606186a87b9ee6b2b5352de89b7bc43d4f72905f1f594127 SHA512 ed39ad01b873d40d0bc611739761d412ff442b2df3d4c2363ec24501547da678cb752f640a02470c8513073a76c468c27fc16248820c779ef7adbe14d0f07199
-DIST Babel-2.9.0.tar.gz 8682986 BLAKE2B 0e1e8fe647fdd27230ee9c97f0994772bd5877f262f9cd00eb450445c5780b278249f87d50f98c5ca3fa5eca287c6b4fc74c5e082c522c250d640912f0ebc581 SHA512 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6
-EBUILD Babel-2.8.1.ebuild 967 BLAKE2B 477668d4aed90f8e92a2b7130e37816f046d2a530174b40945ca480a9401c76e5a97c50047265c51ae9b3866b6e93982af4427200fed6f138ba4600eb0db1fc5 SHA512 892e023892b84836dbdc35cc4d59f1a9ded0593804addf757829a7434c3312aa8b04d4a4365b78cc8dc51fe6f1175324c99f89eb8d514c05317dbfc911ca5a48
-EBUILD Babel-2.9.0.ebuild 934 BLAKE2B 18ff81f0510d7b348566e8b8e41e7463ec7700cb8a1b6a9614d0334a7e2a7e859df426451a9fe05aa62766e1b4d9781e63dd957f31781d4f2bb2bec49b1a1d11 SHA512 844edc216546b31a8573795b135e751bd819782a453efe178c2551f170d95791286bcb4fedcd1901ec4b87fb8d4e2653b6f03b1006a5f66556542b25f10553ec
+DIST Babel-2.9.1.tar.gz 8683505 BLAKE2B e4c6fe7284f03cd9e3e712156d87a520a437316955679f765aa68ca941bf668c544c96598486f3dad1bbb1f1d9a0719ccd527f23a2b1fb0274e453bdba557bd7 SHA512 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0
+EBUILD Babel-2.9.1.ebuild 1043 BLAKE2B b781e3c932b3121e68021087f77f984867f0284999c05f19cee7779bfe4ff2a0b322b0697e696b68d7fcef61cab666e0b6e8ab73fddc6ce467b530d757775c6e SHA512 5630aa39aa17bbe79d63a5eaf2535f6caa6cbb095b232e7833a7dba97e30589d9f06bcd40034974ecaa5acdbdaeb21eb22baa9c6fa12747b07527b843f425755
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Babel/files/Babel-2.8.0-py39.patch b/dev-python/Babel/files/Babel-2.8.0-py39.patch
deleted file mode 100644
index efada9c1d08c..000000000000
--- a/dev-python/Babel/files/Babel-2.8.0-py39.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 167b71421f113e2210e4deefef5020402492e5be Mon Sep 17 00:00:00 2001
-From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
-Date: Tue, 5 May 2020 09:58:01 +0200
-Subject: [PATCH] stop using deprecated ElementTree methods "getchildren()" and
- "getiterator()"
-
-Both methods were removed in Python 3.9 as mentioned in the release notes:
-
-> Methods getchildren() and getiterator() of classes ElementTree and Element in
-> the ElementTree module have been removed. They were deprecated in Python 3.2.
-> Use iter(x) or list(x) instead of x.getchildren() and x.iter() or
-> list(x.iter()) instead of x.getiterator().
----
- scripts/import_cldr.py | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
-index 8993b68e..2ed3af91 100755
---- a/scripts/import_cldr.py
-+++ b/scripts/import_cldr.py
-@@ -598,7 +598,7 @@ def parse_calendar_months(data, calendar):
-         for width in ctxt.findall('monthWidth'):
-             width_type = width.attrib['type']
-             widths = ctxts.setdefault(width_type, {})
--            for elem in width.getiterator():
-+            for elem in width.iter():
-                 if elem.tag == 'month':
-                     _import_type_text(widths, elem, int(elem.attrib['type']))
-                 elif elem.tag == 'alias':
-@@ -616,7 +616,7 @@ def parse_calendar_days(data, calendar):
-         for width in ctxt.findall('dayWidth'):
-             width_type = width.attrib['type']
-             widths = ctxts.setdefault(width_type, {})
--            for elem in width.getiterator():
-+            for elem in width.iter():
-                 if elem.tag == 'day':
-                     _import_type_text(widths, elem, weekdays[elem.attrib['type']])
-                 elif elem.tag == 'alias':
-@@ -634,7 +634,7 @@ def parse_calendar_quarters(data, calendar):
-         for width in ctxt.findall('quarterWidth'):
-             width_type = width.attrib['type']
-             widths = ctxts.setdefault(width_type, {})
--            for elem in width.getiterator():
-+            for elem in width.iter():
-                 if elem.tag == 'quarter':
-                     _import_type_text(widths, elem, int(elem.attrib['type']))
-                 elif elem.tag == 'alias':
-@@ -649,7 +649,7 @@ def parse_calendar_eras(data, calendar):
-     for width in calendar.findall('eras/*'):
-         width_type = NAME_MAP[width.tag]
-         widths = eras.setdefault(width_type, {})
--        for elem in width.getiterator():
-+        for elem in width.iter():
-             if elem.tag == 'era':
-                 _import_type_text(widths, elem, type=int(elem.attrib.get('type')))
-             elif elem.tag == 'alias':
-@@ -676,7 +676,7 @@ def parse_calendar_periods(data, calendar):
- def parse_calendar_date_formats(data, calendar):
-     date_formats = data.setdefault('date_formats', {})
-     for format in calendar.findall('dateFormats'):
--        for elem in format.getiterator():
-+        for elem in format.iter():
-             if elem.tag == 'dateFormatLength':
-                 type = elem.attrib.get('type')
-                 if _should_skip_elem(elem, type, date_formats):
-@@ -696,7 +696,7 @@ def parse_calendar_date_formats(data, calendar):
- def parse_calendar_time_formats(data, calendar):
-     time_formats = data.setdefault('time_formats', {})
-     for format in calendar.findall('timeFormats'):
--        for elem in format.getiterator():
-+        for elem in format.iter():
-             if elem.tag == 'timeFormatLength':
-                 type = elem.attrib.get('type')
-                 if _should_skip_elem(elem, type, time_formats):
-@@ -717,7 +717,7 @@ def parse_calendar_datetime_skeletons(data, calendar):
-     datetime_formats = data.setdefault('datetime_formats', {})
-     datetime_skeletons = data.setdefault('datetime_skeletons', {})
-     for format in calendar.findall('dateTimeFormats'):
--        for elem in format.getiterator():
-+        for elem in format.iter():
-             if elem.tag == 'dateTimeFormatLength':
-                 type = elem.attrib.get('type')
-                 if _should_skip_elem(elem, type, datetime_formats):
-@@ -880,7 +880,7 @@ def parse_interval_formats(data, tree):
-             interval_formats[None] = elem.text
-         elif elem.tag == "intervalFormatItem":
-             skel_data = interval_formats.setdefault(elem.attrib["id"], {})
--            for item_sub in elem.getchildren():
-+            for item_sub in elem:
-                 if item_sub.tag == "greatestDifference":
-                     skel_data[item_sub.attrib["id"]] = split_interval_pattern(item_sub.text)
-                 else:
-@@ -903,7 +903,7 @@ def parse_currency_formats(data, tree):
-                     type = '%s:%s' % (type, curr_length_type)
-                 if _should_skip_elem(elem, type, currency_formats):
-                     continue
--                for child in elem.getiterator():
-+                for child in elem.iter():
-                     if child.tag == 'alias':
-                         currency_formats[type] = Alias(
-                             _translate_alias(['currency_formats', elem.attrib['type']],
-From 7bdaa28a55e8d8228d5434effa4b1473ab7b3669 Mon Sep 17 00:00:00 2001
-From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
-Date: Tue, 5 May 2020 08:05:56 +0000
-Subject: [PATCH] fix tests when using Python 3.9a6
-
-In Python 3.9a6 integer values for future flags were changed to prevent
-collision with compiler flags. We need to retrieve these at runtime so
-the test suite works with Python <= 3.8 as well as Python 3.9.
----
- tests/test_util.py | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_util.py b/tests/test_util.py
-index a6a4450c..b9343aaa 100644
---- a/tests/test_util.py
-+++ b/tests/test_util.py
-@@ -11,6 +11,7 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://babel.edgewall.org/log/.
- 
-+import __future__
- import unittest
- 
- import pytest
-@@ -20,6 +21,12 @@
- from babel.util import parse_future_flags
- 
- 
-+class _FF:
-+    division         = __future__.division.compiler_flag
-+    print_function   = __future__.print_function.compiler_flag
-+    with_statement   = __future__.with_statement.compiler_flag
-+    unicode_literals = __future__.unicode_literals.compiler_flag
-+
- def test_distinct():
-     assert list(util.distinct([1, 2, 1, 3, 4, 4])) == [1, 2, 3, 4]
-     assert list(util.distinct('foobar')) == ['f', 'o', 'b', 'a', 'r']
-@@ -70,25 +77,25 @@ def test_parse_encoding_non_ascii():
- from __future__ import print_function,
-     division, with_statement,
-     unicode_literals
--''', 0x10000 | 0x2000 | 0x8000 | 0x20000),
-+''', _FF.print_function | _FF.division | _FF.with_statement | _FF.unicode_literals),
-     ('''
- from __future__ import print_function, division
- print('hello')
--''', 0x10000 | 0x2000),
-+''', _FF.print_function | _FF.division),
-     ('''
- from __future__ import print_function, division, unknown,,,,,
- print 'hello'
--''', 0x10000 | 0x2000),
-+''', _FF.print_function | _FF.division),
-     ('''
- from __future__ import (
-     print_function,
-     division)
--''', 0x10000 | 0x2000),
-+''', _FF.print_function | _FF.division),
-     ('''
- from __future__ import \\
-     print_function, \\
-     division
--''', 0x10000 | 0x2000),
-+''', _FF.print_function | _FF.division),
- ])
- def test_parse_future(source, result):
-     fp = BytesIO(source.encode('latin-1'))
diff --git a/dev-python/Babel/files/Babel-2.9.0-pypy3.patch b/dev-python/Babel/files/Babel-2.9.0-pypy3.patch
deleted file mode 100644
index 45d50f5ff0b7..000000000000
--- a/dev-python/Babel/files/Babel-2.9.0-pypy3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a291ee5da29fb9767ce8dc5f94e3fa19908f2596 Mon Sep 17 00:00:00 2001
-From: Keri Volans <keri.volans@gmail.com>
-Date: Sun, 10 May 2020 18:43:58 +0100
-Subject: [PATCH] tests/test_dates.py: Fix broken test
-
-datetime was being incorrectly patched, so the unittest was failing
-
-Closes https://github.com/python-babel/babel/issues/675
----
- tests/test_dates.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tests/test_dates.py b/tests/test_dates.py
-index 5be0d16a..3cd70d3e 100644
---- a/tests/test_dates.py
-+++ b/tests/test_dates.py
-@@ -761,7 +761,6 @@ def test_zh_TW_format():
- 
- 
- def test_format_current_moment(monkeypatch):
--    import datetime as datetime_module
-     frozen_instant = datetime.utcnow()
- 
-     class frozen_datetime(datetime):
-@@ -771,7 +770,7 @@ def utcnow(cls):
-             return frozen_instant
- 
-     # Freeze time! Well, some of it anyway.
--    monkeypatch.setattr(datetime_module, "datetime", frozen_datetime)
-+    monkeypatch.setattr(dates, "datetime_", frozen_datetime)
-     assert dates.format_datetime(locale="en_US") == dates.format_datetime(frozen_instant, locale="en_US")
- 
- 
diff --git a/dev-python/Faker/Faker-8.1.2.ebuild b/dev-python/Faker/Faker-8.1.2.ebuild
new file mode 100644
index 000000000000..04ab1b4bc461
--- /dev/null
+++ b/dev-python/Faker/Faker-8.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 5513d722a2df..5301c3de529d 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,8 +2,10 @@ DIST Faker-7.0.1.tar.gz 1143226 BLAKE2B 0c5db5c718cb9d32e3c87d44e7fa66c8cf89a99f
 DIST Faker-8.0.0.tar.gz 1143250 BLAKE2B 594b21ab72016cda550e27d53b032b4e7fffa2554ae81da7291f0d1ad1c63c54a5f849a5c528af1d8357d60bfc92235020c459cd025e0f5cda4b6fd4eab50320 SHA512 612ac59d2c88584243f9b7ff69c92d0dfb69394d419eedc18829641d53ebceca2ab5598a60500428453043a53c53d7716a1ac265ecc5e3a423fcbaa6d69f375e
 DIST Faker-8.1.0.tar.gz 1143544 BLAKE2B aadb12b681f335ff850c20fd9f3202520f265abab9844f4acce51a7c9435e74e5fd8faff8d2ca1d5d0b0ee7c786c05e2968ef84ecead4ab74b65d500876120a1 SHA512 d264b9740e66248b2dbed1331c1d632b9f30e9f7ebce0ff9e03b7f353da14b493a006af1deb0efdccc7911d99e17f741ed3196d76fc17d2b18af42dd01f052cc
 DIST Faker-8.1.1.tar.gz 1143636 BLAKE2B 458bd0bc94dbf9dc60f5f1a74824390a3166dab7328274b087f299dfe637cc0ed728485ebc9418c2877bab7c05718ca1d9a592ed66a6bd4385585aabaeced8ea SHA512 705c890bea67176627eccc5a526cf20530485f1503813f09616d33a5407eefdea0416a6813b9efab719728b89d8be77cfef39d7297731ce3324852a9305717bb
+DIST Faker-8.1.2.tar.gz 1143566 BLAKE2B bfef745578e2f33aef4ae925f53867e0c6335d03e8d2950d035a17a4e2efde959f841f62097708173ef1acc22511fcb6e2f81666aa8ba6e27aa0e5f1f63714e1 SHA512 da989478b122a6e583fdc1de2481d9c81b5f8c5a9c7274fd49dd057e8f2e417f91f5dbc160b0fd5a4b9ec749d3605e54dc20fb603ff36ae75a9d4fad827e46f7
 EBUILD Faker-7.0.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-8.0.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-8.1.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-8.1.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
+EBUILD Faker-8.1.2.ebuild 677 BLAKE2B 3083e57a83ba9f71bf5182aa05b74f5319a89506c0045f3a873d4e85a2cc0581abf7db8a0340746a78a1beafba8741bfbee402683dd16970f22bb474e516e198 SHA512 0cc1bb44b29ace95e929dc634280ffd95d4adae63094c920c1784f8637b464e02ceece2a9ebfef7e3dc0df2cbbb3d2bae006812ea56d60144efc45515856afb5
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 33a1c24d6874..a47b874c8241 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 7420d035c0f4..6fd996836b3e 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,17 +1,11 @@
 DIST aiorpcX-0.18.5.gh.tar.gz 65622 BLAKE2B 68b91e2cfb869c6971efb525fd35132c38ab9092362944fa77476bdb33f076f8415a079d97238e2c4ffbc6c9df596b468c2b6640389a11d1607b1a99aa8dc68d SHA512 5eb8417ce2ffb70208aec79e44ee0d8671c4cf86745f2d8061cf013c4ad17f83db68ed3ed43ef61df196e4ef073a21f9a4e22df46b00ce3054babf98dfcd1eaf
 DIST aiorpcX-0.19.1.gh.tar.gz 72903 BLAKE2B ba3da1bc1f8d83ec6c6d2189aee554b4b819b601d366d0e8858ec73fe6aedddf6a6ed00d56d66c38d18ee44921a4cce7cb83ebf05aec9348355f88b8ed67e1a5 SHA512 b71edf335ad78b1d46b2b23dcb102b29f988d32f75571b881e2ce3471bf48c7ffc9bf509ce1cafec036662bb06d6f90598304c207f416b4124a7b02fdca915e8
-DIST aiorpcX-0.19.gh.tar.gz 65557 BLAKE2B 2bc9d809abbcdcf4dd0358e4bb734068ef76482dc711e1c4568db78e9ae2141e00cffb82c1c7d5976887e0561b6c4f1422063969cec23a886bb192c279fc57d7 SHA512 21d8a75a90233bb4caed804da39274516a7c852c8adf9eabcba928ff7ad9bf922760fdca2c040aad8242193cb23be512803615973256b35347b6c998cccd6632
-DIST aiorpcX-0.20.1.gh.tar.gz 74087 BLAKE2B eee9b3d7d1e513e5eefec97ba30b8b5783b3128cd010b6c8c9530c19c06b1261499559249a9b46c2a8689daebd78d23f97a3b16c25572de80dc13a3650d4d593 SHA512 0f03fe54f268c64028607766bd45dd2fc8ee4ddab30da7744e9493e0e98cdbd9061dd502fd1bbde1880e5f4410f147f4ecf0ea04e4056c16bb784c3f76a558fc
 DIST aiorpcX-0.20.2.gh.tar.gz 74627 BLAKE2B e5a33dfd8ef0c18e26cfee881fd7515437598628bf61dfd86a34f0a758474abcf257c7afcbf0ee1d11ed6bad44596289efe2261d9ca7ccc26e7d949f05b3ad40 SHA512 af63d51bd21a045d71073ba6cd030834f8262e393eac9c44e6b33a2b3cecd86a5d2a6a0ed7ab60d2362e99ab38c801abcae1ada368a533d8f7fb8b616c43e582
-DIST aiorpcX-0.21.0.gh.tar.gz 75194 BLAKE2B dc8494531ca64db15e3e4b35ef5392e8177ca9b5c885c93c146edf921154f42caef5a7b2863a166d337a2f16e99e880b1e315f1f72624f50aa2d73a93c23e054 SHA512 0bcbb31cf367db029ef4acc06b23b6d3f861ab168971e367d760a220c0a6688934a8a91f7bb2fd9d993e173f2049e45556b6f094bb7ca005b37f66179061484d
 DIST aiorpcX-0.21.1.gh.tar.gz 75205 BLAKE2B 5190e8bedf9c605f57d469f351d0cc3bed0c1fad53778ea0f29c02615b0ca816a7bbc60b863dc613f72c67455966ef3ceb31b825eed3cead25f47c29012f7ce5 SHA512 c77d4bfe72f2cd4215e15330c60aabdeee9f4e1613ba5dcfedea9368c85519b36ecc7dbfa2f6682df7d802204b9cea7c9a889ee479dcffbc728ee0c112039779
 DIST aiorpcX-0.22.0.gh.tar.gz 75160 BLAKE2B c9aa55c932546512019c058dd29d397bba79638a56aa949d69980abd56b4d024e9d1f99e96909c2256cce1578ffaf55b14b95d0adf77752180fcbd8ab997555b SHA512 a65202f8233adac587c98da812ab27a26740a21a68df431bf0394dc3df37f3cb15c397c6a9044201b4a1a8d6bcc283a7cf7b4dd27885a2ea0f5942cbbfc6f405
 EBUILD aiorpcX-0.18.5.ebuild 861 BLAKE2B 6f13104a6bff221918e00c198b3fc3596e43dc37102d4ca53eec9774ef0f237d0bfe7ea3ab002584497ca59f448fa64e70dbc0a6fdf4d25c55eb45b0e8af03e6 SHA512 ce74a01085c864f0427da094a6073fce2a002dc32ce93ead0d03b671ec0d25d2600f7be278ba2621ef35d1ee00bc96922f2c0a18d9c97a45d3fae1ae2177ab1b
-EBUILD aiorpcX-0.19.1.ebuild 862 BLAKE2B 512ebba5154a3bfc83dcd57369f539886b7a1a90fbcf8162c26fab85b43deb7e870cf8a35d4e792fb09e33653b8666af5214774c274ea312d9536b7455c4524a SHA512 bf87ec0415697b698aae8a7a94fc93f26be9a735fc90933c0a1d6cd2f8dbe87c0c97e575f73204b50bbdd0b1421b46fe786847cdd884f2be160579d876c2f75d
-EBUILD aiorpcX-0.19.ebuild 640 BLAKE2B 640d8106e3d14386cdea25aadc0b5534321b6c569e9578779c21398a71b7fe424ce089bb60021b0122df363c8f3a7b0324d21d8f1a2f87d2058ee244dfa9b09f SHA512 3010aafc2427f05af99f33d97a84e4f99ddb091feffe171f98a31427504ed8ae143467e7f4bb8417cbc540ac40000241a84296dfd78cec4aacb40b9626f0bfc5
-EBUILD aiorpcX-0.20.1.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
+EBUILD aiorpcX-0.19.1.ebuild 861 BLAKE2B 866c72aeaf7525b91bb1eec97bc933944a78a33f5413e9976881100c4c80ca42b4aedbd3af4ecdc342530e4b6991b4cfe48987f11730a76b6999aa9ef79cb6f5 SHA512 b4546861f9523c91b95c098696b7c75ef62706f925400516458be4d5cf9e3b32f9ebd48ee07d25d7901b1df8b5f8daf86dc574e1c7ce093671928d5a9c289585
 EBUILD aiorpcX-0.20.2.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
-EBUILD aiorpcX-0.21.0.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
 EBUILD aiorpcX-0.21.1.ebuild 820 BLAKE2B 73ce103f602df8720d8eaf7b1011ac8d3a2bfe3ea905faa2d39c6a2b9e7b632e83ce723a092580044ab58d37e185a39c7ec2c27bd6010ef4bf50f7c591faf082 SHA512 d70251ec2a85ea4b534eacf74c43016f49a9453b26c42929380108245eecd5695dbba56e4c3887ad41655ee0566ee779caf68c002f97ef5304301a2ed60a7f3d
 EBUILD aiorpcX-0.22.0.ebuild 812 BLAKE2B 10679fe911cbe607b3f32c2c98c1d1fe0e32b8a92fac6d6c75b39e20a58c34874af30e761ab52ea9d21808b622de34abff3cd8ed53e4b86159df9f17e7a89a2b SHA512 8ccc50c71514326a5b1416f6159bf0e686fd691561f8a692894be0925441d6e0d861505c3540967ebfc349c984eec9706ef92140bd35904689488f1c760c6618
 MISC metadata.xml 405 BLAKE2B 6e2904d4bba224f3ea6898a0050b43aebb88132ab641533837cc39f2404b867aeba63f0466827199a4a4d54bce5f08376328dc1f3a9e50965be06ebd8fa02133 SHA512 5877ba7a1e6d5cd3bd6a5d1484e7abaa524a16d880c15e4b78d47986be8de8d290ebeb0bad628ff3d68d8dd7a85930d05e56c6954ec8e78c6f4e73530f27f12b
diff --git a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
index 06a6c5128633..efad7951418e 100644
--- a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/aiorpcX/aiorpcX-0.19.ebuild b/dev-python/aiorpcX/aiorpcX-0.19.ebuild
deleted file mode 100644
index 1dceb3bd58c3..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.19.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_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiorpcX/aiorpcX-0.20.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.20.1.ebuild
deleted file mode 100644
index 89eb9710f38e..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.20.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# require Internet
-		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/aiorpcX/aiorpcX-0.21.0.ebuild b/dev-python/aiorpcX/aiorpcX-0.21.0.ebuild
deleted file mode 100644
index 89eb9710f38e..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.21.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# require Internet
-		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index f0dbcb1f7762..354c3c1e14c5 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,5 @@
 DIST alembic-1.5.8.tar.gz 1154284 BLAKE2B 704a7aeb15fcfae8746238ef7ae4533ecbaaf83ab9248035c35cea343a4d02e02c00dfa3c8186826a437c839053fc6292c3f8343945ca32273ee608f6572f513 SHA512 e68f3709ed969764cff4c9f755781a10123631d2d07a970674fda2226c84cb92c140bc5ae81e44c8b279823718d4f0544236d260fd04fb7107f3d8293c85b4f0
+DIST alembic-1.6.0.tar.gz 1166934 BLAKE2B 1d1473ca55bf2e5f8f6dcdf2fd7cbd5246e11e7a14e5964a5891c60e5ba814eabc2fe8550b87317c3b57268f649b46c6b611ef1b2c81b5a025ca4e8e537660c2 SHA512 bfef894f13762420128b01d2671639de6361848387d4661d92bab66d8c5820ebe9ede62d335b4cc5915f60378e20a02a2b2664a7bf815294fb4cfdee7414dd33
 EBUILD alembic-1.5.8.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
+EBUILD alembic-1.6.0.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.6.0.ebuild b/dev-python/alembic/alembic-1.6.0.ebuild
new file mode 100644
index 000000000000..6105a9e2d89c
--- /dev/null
+++ b/dev-python/alembic/alembic-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
new file mode 100644
index 000000000000..229738687029
--- /dev/null
+++ b/dev-python/asyncstdlib/Manifest
@@ -0,0 +1,3 @@
+DIST asyncstdlib-3.9.1.gh.tar.gz 40224 BLAKE2B 8d1e564c9f5ac10c7f05dfa3933f695ae458685550fb67401f3bd0d1294ef0b170f5b385cdcf63c0096854538219a0dea77d4d80bd801f1a9b15f5ad3f2c562a SHA512 de7860d84cee7bfdc974a0677cc231323c86238bcb0bfd2f32a62b7356042aad647ee8d627393be35c5a134855d5f76967143ad8347df9d6258f46bc2b43a62a
+EBUILD asyncstdlib-3.9.1.ebuild 520 BLAKE2B e55f8c8c8587835b2fb0289b54e154e8d5e7d7b732e97f8a97582bcdd4f03a8d2160dd6d8bb1b58fbceac3a2cec2a537188bfd5d1727020a86d35974aadc1f45 SHA512 1f55c488b59d7456a9cf5be6b2fc83b022706a5b18c69727baacad45b590c9ae4c20c9bdb66750966dfc69e6198f65eb4be6ad9480f55bb87646d238e5381716
+MISC metadata.xml 358 BLAKE2B dafa64f8dbe8441d1c638cd591ed583cb739c6babd39695876c1f02ce501bb9db0307a5d9a80a58926011103c20557510ce7490187e1b6963fa9d7a3064b8886 SHA512 5d125f57f631e616bca75af464b046b16713f791cd202bb8e812e8a0912854bb5c15b441b0a7d4ae13b6eba58204277ac52985c6f36c0cc8aff4d7bcfe184a8f
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild
new file mode 100644
index 000000000000..0c31c6e1105c
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="The missing async toolbox"
+HOMEPAGE="
+	https://github.com/maxfischer2781/asyncstdlib/
+	https://pypi.org/project/asyncstdlib/"
+SRC_URI="
+	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/asyncstdlib/metadata.xml b/dev-python/asyncstdlib/metadata.xml
new file mode 100644
index 000000000000..73809eafc502
--- /dev/null
+++ b/dev-python/asyncstdlib/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maxfischer2781/asyncstdlib</remote-id>
+		<remote-id type="pypi">asyncstdlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 3a20915c2490..f5fd7b3cd823 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -11,5 +11,5 @@ EBUILD autobahn-20.7.1.ebuild 2995 BLAKE2B b1a4536d3153fb71bf0c83d89bdab51beff8c
 EBUILD autobahn-21.1.1.ebuild 3144 BLAKE2B 2e5fde2e2aa2dc0405b4e52648c964b34ffbcb6435f8d48c0380dd7a2d7544a4bb1a8b2b5f72e00f1ad6b8b6639ff42238dd47213af7b81c6d6cf2c2736ef663 SHA512 4701d657a96a30ce3abdac31c6969331153780b751235fc704087d1f882cf88c71ba71b2e7332bb49ffe5594a77f10673e8cd3d25c9fe70eb77f8501eb23c678
 EBUILD autobahn-21.2.1.ebuild 3108 BLAKE2B ca119cad37f38de68e006a7e7947ee27e7fc2e7460a1e5f1cc292772ab93b3055e6915f6413f98f52d9d814bcab946f59f48085da833717572b17da17d052a41 SHA512 9a755eecb6e8c856f95f5867cb3144470352515a1641eb473ec9532b945c2bdb8d75fd6278bed8ca71551153518b5753d6cd0cb6cde9c14f07e5a131653db4d1
 EBUILD autobahn-21.2.2.ebuild 3252 BLAKE2B cc7b5a8c3007877e53b98d81833b1d08847483cbaea6772b9529da3ccb07095437e8f8a31f52aee4bdd6db31a2918af972a7499478dbbecb18c661d0280ce717 SHA512 8510e3da99f86d9119124001b3da4ae29aacc979342407a41e3c9090ca71b8c85e301c3ece1069cf6e5475a16b79e27bf086ce0dff5ac3d56c13e07a5ef91620
-EBUILD autobahn-21.3.1.ebuild 3252 BLAKE2B cc7b5a8c3007877e53b98d81833b1d08847483cbaea6772b9529da3ccb07095437e8f8a31f52aee4bdd6db31a2918af972a7499478dbbecb18c661d0280ce717 SHA512 8510e3da99f86d9119124001b3da4ae29aacc979342407a41e3c9090ca71b8c85e301c3ece1069cf6e5475a16b79e27bf086ce0dff5ac3d56c13e07a5ef91620
+EBUILD autobahn-21.3.1.ebuild 3251 BLAKE2B 31790f288ed3300c251f34bafd48e8c656cad668ef26e6c2b8924e60eb6279f80390746d6afdf1d52af206d76ec21463397b3a9152ab72a69e25b30400f17567 SHA512 9b46c3e6da5e0c67e4eb34393ae46f15b329d8d02ff99de654638e040192a768afe0155e4be2ef0348c6e44449bc9e05afc34195abcdc74be43fed15b50a12c5
 MISC metadata.xml 665 BLAKE2B 11ce0fe43744ff03c46a4e4b6b06733807a4674956dc885a3185bd353f0617841a6f6d1afbbc02c02b7e6718b5c0ccce69907920322e2966c8f7e9d1f63d6485 SHA512 9e154ce907c9868b86a70c4c2f6173e4fa8cc6e1f63380978d4a9c706f00316a9eda488fc39c32c5ea70f31a1a12187629665b590e79f64906ab982bf1401fbb
diff --git a/dev-python/autobahn/autobahn-21.3.1.ebuild b/dev-python/autobahn/autobahn-21.3.1.ebuild
index 4c94153771d8..2eda49774ef6 100644
--- a/dev-python/autobahn/autobahn-21.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.3.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="crypt scram test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index a457a7cad635..863dd3213a94 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,6 +1,8 @@
 DIST autopep8-1.5.5.tar.gz 117991 BLAKE2B 74e9bfed663d68f4a73088fccd879c538d40c564e7527b067d549a15361dfba2adcb853a8895fc61da50972f947ce23900f8067f5b8e715f73d6a80c6c27ef5b SHA512 9982271805131a7330d4a2a46eda65c05f079925393686f2df7eb92dc9e172003f9d788663cb8c0c8849dbae4f64c518c310eb65c3df308a12700abab084c39c
 DIST autopep8-1.5.6.tar.gz 121134 BLAKE2B aefeb4cc53ac66fb6eaef4d7af286d6249e7139e5409fe6f6b3568f0c6216d758dd73a950d043e36b6f19cf5de83f62e28ca318c45a7e40ffdeac0f7a9e06cdf SHA512 d283c3e2021025097c6b2f95faf7db12664b7d1f69f82acf9fe94e20fbd49cfcb28ad47437aa3148503c59cf5c2690a842fd795f869731290c80dc9feb86637b
+DIST autopep8-1.5.7.tar.gz 121537 BLAKE2B 06f107cab210258fe71b8e912312520797122fd38e3e67fa0d6cf640806690e1255fec63c74c11ec39952a4a50964a3f622ca1166d29299c4f7a7031a1013202 SHA512 b8fb8b63400e74ea978f576cb47c99b0a4bb15a5d1cfeb6ffc25d2ecdad301762f99ddff5c75af3900b3560797d9289a15bbb87ddcf74077d39bde0abadd4da7
 EBUILD autopep8-1.5.5.ebuild 848 BLAKE2B 611f5c07e00f65d96e6b9937c3901a1e8eadbd5935305930f5cd51dda81d08161a936a826efc84e360b3200c642e3eb0e17fd13129596a8ba410734090bafaf9 SHA512 e2676d967fd0e231c6a10ea09f779bd9248d531e881d35c841f6062058d2bcb3a683745076db4c2a468752d7a15c5c5fa34e3c307fe3153cf63aac8aca9f1c37
-EBUILD autopep8-1.5.6.ebuild 850 BLAKE2B 814437c0d405465f58fdbeb97c1bee6548fc68064c8103aeb9aa28dc152beb0aba91c005afc07915d771ef569264875633a1ae1b10e94d8752c702817d0090b5 SHA512 0abe479925923f05c5c30411acf91c6bc3fc7f074b6c0f1c1a9605abfb4875d01d6e908b64c8f11eca4a403222b1d05d46190c33c4754ac9c72a2d9ae735a759
-EBUILD autopep8-9999.ebuild 852 BLAKE2B 8fff8cfdccb97703fa9d3503c9c3c649de315241d0791f1927161e3385cfa0945566b3ca78c04a56a147f2a4f7fbff603810b98bba1f6251c821bb6e004c7020 SHA512 13ca0fb94ff41a20f23e416438c90205123f522906732d6b43d759b87d70f5ba6d7479512d695440180c2a8b1744e7486d5d8f10a81cf1d77b23586fb5be564f
+EBUILD autopep8-1.5.6.ebuild 848 BLAKE2B 205cd40a83de7fe8682c537ea8134937a3673539eb9dc349180fe55581f11b4f8de67e386536dd6abaadfaf23e26639bd6e625a71042245b0a3ec7c9bc7cb1d6 SHA512 dbfde3ea39422b65a370043e0f970a1b2d959e478825b1462107fd7f4428580f32437fe6ed6a58062912f94a69fe31cbf91bb44df2dadc897bc48658a21ba349
+EBUILD autopep8-1.5.7.ebuild 819 BLAKE2B 227e3e1fbcbf9ad1b46d6906afd3e297e0908952b1008caba6929855d6d055dec0c41173bb6e0909199ece7412ef6151c94acddb849933df1b206fa03a188e79 SHA512 70ffd4093b06a99ab068992569aa3aa141d5612da0c4451e59e9080111462ee471e3d8a91061a7a56e31a6d8df833e4c6d226c6ae1aa860cbb5a59786e114a5d
+EBUILD autopep8-9999.ebuild 819 BLAKE2B f5e3ae9fa936bc8265acfe2b8d15dffde30c039758de979f8ecb9f514123750205b85937930f291d083448a266ab183f2db4e1672c9129219e9fe43337724077 SHA512 f201ff2476aff8d1126c59300741556bd6d774c8c000044f2de27390a58708ee144ad8baae49c7f2b507a0d9b6e995ef1b31f4e041b31829046a4f7ec723e430
 MISC metadata.xml 403 BLAKE2B b84ac94eda3fac9977c2a936d006626b0fbc918c24d8f08f4b7620b778ea5ffec298945bbe6baf5353fc00888ee97c7f3c48493ab1c83ebe1586a9196da13a59 SHA512 7e2fd3edd7e82fa2474441a0e54ebbca38dd95f2dba7ba717fd839cf11bd21cb00d5ee56c7b8dc1b377e24a33b098d2932cc06de6c367e1c812b448a9395f18a
diff --git a/dev-python/autopep8/autopep8-1.5.6.ebuild b/dev-python/autopep8/autopep8-1.5.6.ebuild
index 9ef96e6cfde3..6c9336c713fa 100644
--- a/dev-python/autopep8/autopep8-1.5.6.ebuild
+++ b/dev-python/autopep8/autopep8-1.5.6.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="~alpha ~amd64 ~arm64 ~ia64 ppc sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/autopep8/autopep8-1.5.7.ebuild b/dev-python/autopep8/autopep8-1.5.7.ebuild
new file mode 100644
index 000000000000..809832964cc6
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.5.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index a3edf664463a..11848b6f772e 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index bb09059acfe0..c2190cf3fd16 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,3 +1,5 @@
 DIST aws-xray-sdk-python-2.7.0.gh.tar.gz 265934 BLAKE2B f697c2bbe21db4b20b200ba9e9c264df81e3a6ff64d73639756d8f51a1abe0ecfaf1b852a3befde535757dfa3f75348e2eee1d5124147f04d11f5b5f20976b95 SHA512 d9ff1a190e5503f904258ac47cd7b1c686a9c74d0699f69f053df19ec7ea197da1c9c29a97624ff0758346a0dca9e3a292bf54ba3f340fcd392248602a85bfd9
+DIST aws-xray-sdk-python-2.8.0.gh.tar.gz 267880 BLAKE2B 7a433a0b1b3ca38a100f3b23c79e9b0d7f84cb096f6d30832fdf16f171f9528aee8b81aaf3ba263a90d46f791de8b2f37a919651f9699e5fcf3073db83fc25b4 SHA512 e0fb3fb0bfbd963863714537ea12771df7ffa2857aaf4cdb6414d71ecdfc65c2623fa40a6a48c4eab30f4370d545a595db2762932133a6eba56121a4048502fb
 EBUILD aws-xray-sdk-python-2.7.0.ebuild 1891 BLAKE2B 6e46f1947edc500732116be631caa143b0aadd685365274d76e3ca57019c9d689fecd5bcaee83d406aadcd9dbdef5dbda23a79d27b586c7ececf11ea67431954 SHA512 f779664389e7ef9de9d2d4a4184bad281c8000ec682b38a638df367ff517e42519a4dd108ee3043a8346cea09faff3c0da146047f9ca7b126fb65be52232fb29
+EBUILD aws-xray-sdk-python-2.8.0.ebuild 1961 BLAKE2B b7a5fb71d6916d2421d067144249ade2514bee0be5fe53f7403c1329dac1435088607472c51ff5ac37f7407c334207c05da9328523de1fc673e1b99007c1f086 SHA512 2b2a2e64b7fd949e9aa414afabf7b1579fa67af55fbb10b860968db8ea93dedb28180851cfed140234d739c0a2d84cccd3a8e8b49f93fca1ed7181ae42eac3c6
 MISC metadata.xml 477 BLAKE2B e68a8686e491164d7f547d858c230a47290cec6062dc7feff60322135dcb269d59ee0b53208d8eaed14eb6b3c03183898888bb42663309818010a6ab3529b45a SHA512 fdfad8d869df01fccdfd19b3395374c67793cc2c96f9e8e02962921d8357df5ddb0fae391907c7f1e987ae57618616a3263a1f0dcde0a8f84576f605ed15ae34
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
new file mode 100644
index 000000000000..f1434194a8ba
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="AWS X-Ray SDK for Python"
+HOMEPAGE="https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/"
+SRC_URI="
+	https://github.com/aws/aws-xray-sdk-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings
+	local -x AWS_SECRET_ACCESS_KEY=fake_key
+	local -x AWS_ACCESS_KEY_ID=fake_id
+
+	local args=(
+		# unpackaged deps
+		--ignore tests/ext/aiobotocore
+		--ignore tests/ext/pg8000
+		--ignore tests/ext/psycopg2
+		--ignore tests/ext/pymysql
+		--ignore tests/ext/pynamodb
+		--ignore tests/ext/sqlalchemy_core/test_postgres.py
+		--deselect tests/ext/django/test_db.py
+
+		# Internet access
+		--deselect
+		tests/test_patcher.py::test_external_file
+		--deselect
+		tests/test_patcher.py::test_external_module
+		--deselect
+		tests/test_patcher.py::test_external_submodules_full
+		--deselect
+		tests/test_patcher.py::test_external_submodules_ignores_file
+		--deselect
+		tests/test_patcher.py::test_external_submodules_ignores_module
+		--deselect
+		tests/ext/aiohttp/test_client.py
+		--ignore
+		tests/ext/httplib
+		--ignore
+		tests/ext/requests
+	)
+
+	epytest -p no:django "${args[@]}"
+}
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 01d285e67067..a1fcd395fef2 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,5 +1,7 @@
 DIST bandit-1.6.2.tar.gz 498567 BLAKE2B ab7885df634ff8258fc7620523b56995cb2f262f4290193a9063e216f66ba8ecb31ec17f09d0b72a0472923266953c46e47e74fcdfb39784873738c033e00c6c SHA512 9facce98411ceb9e33e5a978ca4aad2dab541ffe215e480806ac921b7f7067572445d8e32e8d473ef30bb57155b72b2ffd4e06d458a3da82e2a9fb1b1d8a4b9f
 DIST bandit-1.6.2_py38-1.patch 3892 BLAKE2B 750160be3d234b0d638307e74fd130921f43f460edca8d0ef0f9a98f34db709e0649b1e481668abd094942fa05ee710b82b3161fd82bc56bb0f5e73d90a6e70f SHA512 dc1e55bdcbf180e70757dd92aa590fe1348d84a2143af73e48c35c62864cf0720f6b055482eb274a4261adff37c84f998c75916b8ab70d99264bd88d09611e06
 DIST bandit-1.6.2_py38-2.patch 3724 BLAKE2B 8ce857419d99b059ce1b28aba7c04218397cad82f0fdb6e7eb3e57f698d6360de7b0f4402c40540e41d510db1aa0b75e006e0e15a20a8c5534b7e5a3cf78a0e8 SHA512 25f73b087b296867556d9b9bb7f789a4df64bd2930509086bc24312c43a3a98209d63a5b00009e31fd2653e89c85e62849c7af6ba044abc10c5789a6e3d9a968
+DIST bandit-1.7.0.tar.gz 506225 BLAKE2B 6e2383576b2091ab98757381bfd5915331fc7b08a251e817a6964d963de60b070f7c4dc7958dd366cf95333f4abc157e80433490ab8b923580cb45d855c13092 SHA512 c51af7ab4c667c376a11f142fa35881a776d420bd3ef41421bd29a713e0b56bbf1622e24cd878e24f57594f03d06b7c2b8258fcf34f57e3a68df4200a34becdc
 EBUILD bandit-1.6.2-r1.ebuild 1782 BLAKE2B 385685b5308aa5062b74b5de06091341f4ccf51d0a133ffccab976d1075919bd0a97ffd8bbc4ccfba01166522f1261ca33507d14e2808e2d2092ee18eb7f6a26 SHA512 0fb2564cae7b078e7fe4de11e99183a20b8ebbf97553823607856f4aabb9d6162bd0492775dc769f3a3c5ce2ca1b813d6542ad2bf60ef023db07531b53fd0d3f
+EBUILD bandit-1.7.0.ebuild 1400 BLAKE2B edfeac24cab126e7c6d017ca33fa1d1bcd93897d6c1fa95bb0bd45122c81055713760556ace6a9fdbedeb3492d277b2c20787d44be4a2cdc917c414d3e8ddc59 SHA512 8170fc4d58890699fbfe3018e74592f6471a3ffb6839b37fee35fd04964ce6abe4b9565f54d378a0ccc0bdfee86d3e489ff9d6c6ba38ca82306ee190f76a3428
 MISC metadata.xml 684 BLAKE2B 7018c2b15088d3fa89c56a9b8ab316342cdc5e6b4a1437a22dc07ad1a5026623da288630cfb583a2b149ca1cb35a83353345652cd06dc206e5dcfbab7cc28465 SHA512 4c877fa708ef556c2435606b4f8aff213fcbd6a43d867c9c408c2bcf634ece14f36dbe45aebc7e9307cd87a624c83f5d1f6a944c0ce52f87d39f996ce1a11028
diff --git a/dev-python/bandit/bandit-1.7.0.ebuild b/dev-python/bandit/bandit-1.7.0.ebuild
new file mode 100644
index 000000000000..9b52baf9803d
--- /dev/null
+++ b/dev-python/bandit/bandit-1.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://github.com/PyCQA/bandit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.5.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-3.0.5[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.5.0
+		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	sed -i 's/yaml.load/yaml.safe_load/g' tests/unit/formatters/test_yaml.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	stestr init
+	stestr run || die
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 55be2505f2f1..eb7ff0fca671 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -2,7 +2,9 @@ AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff25
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
 DIST black-21.4b0.tar.gz 1140469 BLAKE2B f5fecde9083984e823a57acb4216ea46130255d73646209f12990c27f2d15eb7b2a31995a99f54d0fd5372aae9267bf015331d8599d38d91ca429e6c3a3c3b54 SHA512 a6e707361544abcc35bc2cbd4d92ad26b12a961890adf60b05330e9eb14368db10e92b17fa3535bf0f7e20e7976cfa3821dbf9305a37bc2426fb493f7ffdf843
 DIST black-21.4b1.tar.gz 1135304 BLAKE2B 9dcb90109a9cbddb53682b6385f5b7ae5cc650251eeb8866921bdf8f04264d5ebeb2eaf4ca04fa761d461c6f389e352cafc2b2dc521fe6566a9d41da48830e44 SHA512 1a7d3ada1c91084c6e84df9367abca6d64315ba25dcb3a65ad13bfc3db76a13a84b1668fb23563e9f2ce61df72bcbd776b9d641ce670023465768c7269027e0a
+DIST black-21.4b2.tar.gz 1136152 BLAKE2B bd1ee42495953687e23338df793bfe791352ab91541dc9b563a1274378a6527dc9eccea92fcaaf3c67403448e0ce7d99f605ff7dab1d7d38926f0cc84a859e1d SHA512 6d74bb718aea64db6e83045af7e787419efd7fb647c7d2b49a412e92e796a800fa4f1496fdb28253af894956984e22836761d22677631726f705d78143a63444
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.4_beta0.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
 EBUILD black-21.4_beta1.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
+EBUILD black-21.4_beta2.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.4_beta2.ebuild b/dev-python/black/black-21.4_beta2.ebuild
new file mode 100644
index 000000000000..9257824ce16c
--- /dev/null
+++ b/dev-python/black/black-21.4_beta2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	<dev-python/pathspec-1[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' python3_7)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
+
+python_test() {
+	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
+	eunittest
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 604b7ac76be6..59a995bb721b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -11,6 +11,10 @@ DIST boto3-1.17.56.tar.gz 363210 BLAKE2B cd3fd8fbeaf55ef7b3b4fb9ec345619f7b0fb08
 DIST boto3-1.17.57.tar.gz 363474 BLAKE2B 230f374f95d2dfe030e5e27f9f2441f3630e0596fe869dc57c0fcad6424ad50a20bb95b943d3a2ce5ef859b94169dbeed4682879d9d24544a24cf27b4f7508e2 SHA512 e0f670263f5eda352e40be28fec7f9926b9caaad18345f6eb8bf912d83b5c25d1345bf18d9bcdfd2186886a6fd0140f1a4f4887632fcd29390c7cb66271fd909
 DIST boto3-1.17.58.tar.gz 364365 BLAKE2B ae2070ed5a7be752fd127bad99bb08c25f655e03b52650f4ce6ad9c6c4e030fa1c100e169474e824cd128aea1a067cc0b9a51a6113fb8a816f06e47f9ea7e2c2 SHA512 bbdf4bd1e1c833dbd19d06b4ea9aa0970ef2a585bac81c9267cf19ce7b9cdfb990bd06b67074b8f25d2bd422bee0e619af377a015eb0a3d94cf79c8ef52675b4
 DIST boto3-1.17.59.tar.gz 364596 BLAKE2B bd90e7a61cf5f4c63b7b43518a55880c0fdcadb62550ca1a4099deeb26f0f6681ead84b4f7967dd43a8745d4eef2ce16732a1bb548c64e4c76d2c93a7cc39e04 SHA512 510e53c10d5e34b76e7d81f79e6f4d546abd84308bda2eb25c03477cfb0242c2755b3b21d75d99092ebe7b37738e6b916a9e88a481c737efafaebf216f975196
+DIST boto3-1.17.60.tar.gz 365384 BLAKE2B b200c1eba271440f2fa2b42a97bfc9b78b5b4535a03b2c27b8d041ecbaa26c9581636163295336e51a6e6e818cc89f99552cdbb8b3079e768f78117775e4f298 SHA512 0e8a32749cacfa48ae8c235ec619fc71525f46c9492a62d24d14456ceda197907fd487664e5cba961745521801ec3a32ca428b86f87f800499869a45c2fbc8c5
+DIST boto3-1.17.61.tar.gz 366107 BLAKE2B ccd13150f800d6d783784d84cbc8bf8fdefa6e7dcd4bf6c6ddf23efd79bdc2999864135859e44ee4982d725930df9f52d5d94ad4a9bef0ba1e990252bdbe2f6b SHA512 4d7212174b61e06f0443e411b25da549e0fd540278680a22b7ec4838e90d3b53453b2aa3a279891ce92f2646e62c9390d4ad9861239de8d60395244511b80558
+DIST boto3-1.17.62.tar.gz 366832 BLAKE2B be452f1afe79538c29a9c8d8aaf0e0d0224a34b78a7d4f261cea1286e21e7154784f7aa0a544aef68161a861915a19b12fc1526ed7499ad9de6fdb638abb5b7d SHA512 64c323cfcfdd4a1adf083dde08fc88707975c03c4536ef8f66ff08694c292705dca7f11a37c0a2b1158facec9c0c9b58c62570e61e3018ca218f1207d0713479
+DIST boto3-1.17.64.tar.gz 367357 BLAKE2B 582cc599628df29acdb146a0a1da78fb1e35d560f08f54709e5aed9fb27be9ffeaec27b1c2f393ddd48fad5b9c5ff5e51d001972a798b516e089d58d321aaac3 SHA512 ffe248707d162de5a2edd2dec4acb769bda3d2d0c9611548813647d3f0d70de9e6754216ba32df70eacf2e4a6ed2c8fab30261731aa87977eb5972af6052ddb4
 EBUILD boto3-1.17.33.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.44.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.49.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
@@ -24,5 +28,9 @@ EBUILD boto3-1.17.56.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2
 EBUILD boto3-1.17.57.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.58.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.59.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.60.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.61.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.62.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.64.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.60.ebuild b/dev-python/boto3/boto3-1.17.60.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.60.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.61.ebuild b/dev-python/boto3/boto3-1.17.61.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.61.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.62.ebuild b/dev-python/boto3/boto3-1.17.62.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.62.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.64.ebuild b/dev-python/boto3/boto3-1.17.64.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.64.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d9a62b106bae..c8d1f66a0e8d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,5 +1,6 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 AUX botocore-1.16.7-unlock-deps.patch 598 BLAKE2B 27b0c4d42da15c009c1a9181a757aa2886343a6e486710de5f962fe09ebe3ee9091830aabd17544e2112de2eaf91d63ca881ce050b6b9fa9af86337f3146a791 SHA512 6028bd13aebcbe6afe66018185d22f904c010cfd41f014b43f361c73799592d223af0a23d8fb3086f4bba9a1d106f60afc68e659dcb78d0d2a967442130b3179
+AUX botocore-1.20.64-bpo43882.patch 1106 BLAKE2B e08e112f1afd9a4b80600550550903594901eebf94d44cecdfc38ff2e6007594f796506377096403f3b77a148acf92bcb2373eecb705e3f150cd5ce41c0b3c76 SHA512 1bfebf53c8cf9a2e84b7493365b90e87174cdaf0eb138921877f2f726b5b9acf7d0cb4b4fa4f532f23cfb29bb48150ad01ba582b1a19c3b0702b24f69208e5da
 DIST botocore-1.20.33.tar.gz 7543656 BLAKE2B eefd7b06c5a43780982616cfd640c6a1c5d9e919b403c0f78be06833e8e618b142cabacf2dd3b3e13cf351bbd5d0d42ef23b314355f68f7d9dc6aa9cae6e377f SHA512 6354ed7ebbe467ea96c0ea0e059acd2be0a40973d55998c0e006e73a67f2a69bd8009099f761af83e47022ad27698d3a21ffc2824ad4b74a687bc490239420e0
 DIST botocore-1.20.44.tar.gz 7596878 BLAKE2B 935d4ea1c5212d29566c3344761b00d2eb03e7588bd7805072926ecd41f0fa03cd91e25802dc63078190c49f1b8503545bd0b2a88d702c04a961d57a0022080f SHA512 eb7ae15bac4ae8ad516ebcd8166f65a809d7d02c11dde25b714f7bf673ecfeef9ea414ab4b53ac428ac948ee8b054666ba2f6c0a96e6d148ff46d94e6100350d
 DIST botocore-1.20.49.tar.gz 7630973 BLAKE2B 89d10ece5cd645d6904046804c2b2d789d7d09c2aa231856f7b5529f54a4933c2bdcc800a64d3bbc27d9f4a7de7debcb3fbc37ead1923b7fa3dbb44b40dd97e8 SHA512 994f9ee04d0b7c99aee12be5823c29fdafe145b7db71df765ba798ba33650b2189fbbfd274aec1051a7e9be1d1ac0ebf19b61ce4d8afd98635e108bbb2c63351
@@ -13,6 +14,10 @@ DIST botocore-1.20.56.tar.gz 7654165 BLAKE2B 379dcdcb7f528124a925c5ec191448cd319
 DIST botocore-1.20.57.tar.gz 7654823 BLAKE2B 7a92bb0fa470ee6d73eb6289e1b332ef96cb9948c8caf32c56a666dffaf738b71b39bc4798b07206a7991c56d3872e974b8cafc764d89f598efc3979f2dc1b21 SHA512 909d019295055f0b70465aeeb64a883ebf34ec3097e486107a5379c05f2dacfb6a106c5c38c0322f41a7d875338b09de5234cb3c90b00deeedc9b4f756421701
 DIST botocore-1.20.58.tar.gz 7649484 BLAKE2B eb945897b9c143a7d9149cd9a938de08c6e610da428b8d21cefaacb51606414f90107c6abc91c81bebf4f890bc52adc31ddf3cb942f765557214a91bdda55135 SHA512 9eaa93f9764b732baf7ec3fe9e456b1314f6b253cb19aac7ad8e0e5e3829d1ffda75682d79e20310e3918b2a83c46a451a6f2fb931eecac75be132d358352f76
 DIST botocore-1.20.59.tar.gz 7649640 BLAKE2B 7757d85d5ecfdc65d7da607824fa9abf56628395cdd1a4196fd0d1833fe97f8a75285083c1c61ee9dd159b778ee3b9fce07903b7e30097bc386cb6108515f39c SHA512 06850bfd59f9ac562569eb5a2a3e5cb7d4104053f0ab31fc315312122d5c861a68f811d422e9f1850c8449c9387ffc72feef9496a9216da359b2c0b8c713110f
+DIST botocore-1.20.60.tar.gz 7666269 BLAKE2B 1e32a46be67cb23bc26592036296adf1410b7d43888bbb27a156f996fe4db0f7e11a048b584671bbd9fb9f9dc3f426c43ffc7b4515227e373b97c1fa3a6ccdf4 SHA512 55bb5514a150b4fe152d2bdc501ea238cce83a81f9593e8984dd94cbeb80389f1feb9ea840ce64198aa2976d1130962f652620da540330fa9627f4fcd1299eca
+DIST botocore-1.20.61.tar.gz 7668184 BLAKE2B 2b48af271b0a7c90f18de0e1742fbf5a7fa9ae024acbcce45c8c18bd5d81b70e83b1be1833aee9ff01e6715c4bc1494483d3f903edde9f76fe3acc5b5f950a64 SHA512 8b79a524c17a70b44587485a27dc5334db8d0f4072beccdbed84599e4405231eaeaeec0a4b0ec01ad302d19c190759b99e80a93b55d2c4f7513045452813373c
+DIST botocore-1.20.62.tar.gz 7674812 BLAKE2B 6fec1213c13bc12937f45c2584ce52532ea75d6973e9741d18933dc399e8f0ec569d6aacdf4a9f83f997ff9898cb39c327410965d992836bbfbd9aa06ea81311 SHA512 ae25e2266955964de7be499fe17b64dd5008b1c1abec84167593b04a1bd4f7baa506f91013b292cd42aae01990ec3523d75e3529398185fdaedc358bb5048e83
+DIST botocore-1.20.64.tar.gz 7685481 BLAKE2B d939b262f04a67918fe61ba0789a4ac9a73bd571096fde881ad537bd7b193798960096ea6d966b49634f33454845c8227786c7bb16c0008e8b5dd84591c2e018 SHA512 a2e82988e59f05ae7050b3e8f86b379dde83f516736c9ca133c0fa678cb7c6ba5448e2165cb0ab3f4262e8e3681ede37048508092ba62313e6ce3f89700c8827
 EBUILD botocore-1.20.33.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.20.44.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.49.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
@@ -26,5 +31,9 @@ EBUILD botocore-1.20.56.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659
 EBUILD botocore-1.20.57.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.58.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.59.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.60.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.61.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.62.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.64.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9febd72688c640a1927b6087dc76668c5847c6045228542bd307636502c7129d032f7d3729198880af42b987f1434ffa SHA512 3960600a101561e65dd0c209b716c8db550d0ecc953d32647bfe24cd5d5477a06db96d09cb00d0b9d6ecb57c3a2243e542adcd53f12f9a2a70a7c6ae66931e59
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.60.ebuild b/dev-python/botocore/botocore-1.20.60.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.60.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.61.ebuild b/dev-python/botocore/botocore-1.20.61.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.61.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.62.ebuild b/dev-python/botocore/botocore-1.20.62.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.62.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.64.ebuild b/dev-python/botocore/botocore-1.20.64.ebuild
new file mode 100644
index 000000000000..f051cb0e68ac
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.64.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.20.64-bpo43882.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/files/botocore-1.20.64-bpo43882.patch b/dev-python/botocore/files/botocore-1.20.64-bpo43882.patch
new file mode 100644
index 000000000000..5f2e652f5baf
--- /dev/null
+++ b/dev-python/botocore/files/botocore-1.20.64-bpo43882.patch
@@ -0,0 +1,35 @@
+From 9a25a6e9ace15d5f6136a2e9dd77324bae119f46 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 4 May 2021 13:15:54 +0200
+Subject: [PATCH] Reject endpoint URLs containing LF, CR or HT to workaround
+ bpo43882 fix
+
+---
+ botocore/utils.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/botocore/utils.py b/botocore/utils.py
+index 378972248..b154469bc 100644
+--- a/botocore/utils.py
++++ b/botocore/utils.py
+@@ -977,6 +977,8 @@ class ArgumentGenerator(object):
+ 
+ 
+ def is_valid_ipv6_endpoint_url(endpoint_url):
++    if '\n' in endpoint_url or '\r' in endpoint_url or '\t' in endpoint_url:
++        return False
+     netloc = urlparse(endpoint_url).netloc
+     return IPV6_ADDRZ_RE.match(netloc) is not None
+ 
+@@ -990,6 +992,8 @@ def is_valid_endpoint_url(endpoint_url):
+     :return: True if the endpoint url is valid. False otherwise.
+ 
+     """
++    if '\n' in endpoint_url or '\r' in endpoint_url or '\t' in endpoint_url:
++        return False
+     parts = urlsplit(endpoint_url)
+     hostname = parts.hostname
+     if hostname is None:
+-- 
+2.31.1
+
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index ebb7e3296ef9..4cc0bcd050c0 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -2,8 +2,10 @@ DIST breathe-4.27.0.tar.gz 186352 BLAKE2B fd4cac6e32a4988812085a71ea6b7222058d68
 DIST breathe-4.28.0.tar.gz 187954 BLAKE2B fc17eb9fb47f01907a3edeb316a427c9f06b802189cb860fa43bf7333a2897c36b2ed6ed008ca30e6e5c856d10fcf55df53ed05997ea60c29aade84cc1e5111a SHA512 a02ff717e4f50d336c91aa943a6a15b7ad834e3896d63c3ec31b3d10ff098400c53fb80fd3441e115194942722e5fce8f9b858fc3a3ba691aac900e0b415906a
 DIST breathe-4.29.0.tar.gz 189293 BLAKE2B 8eeca14c24b819c4a6510674a55a4f6f9397e33752f449c138a4b3f8fa139d50a7dd2446dcbd297ac6eb7b666090e11fec3de770120e1b581d1586d9f1356bc5 SHA512 2b9824c66ef2cfe4eda1c783ffced147352ce7e59b09d1ff2f728e293d9624aa458e534185c0745aba244817abd58a5d781f4447fb52c9ce511654c06a13748d
 DIST breathe-4.29.1.tar.gz 190929 BLAKE2B cb5cbad4005e0d6ae292d13f2011b6d254b519adaa07b6495f577c6ff5fe0eafcec9bed5cbfca0d11b7e8a51c184a0d9100cdf260db462fde83071548831da31 SHA512 a235a7b15dba12e463ffc078e6cc94a60eed8371b51182a4c55691ae2c42d76e1cfbb957ccc9d82a79e2a08297a4b93121811990421e92b9464fd8bf9cbbbb78
+DIST breathe-4.29.2.tar.gz 190695 BLAKE2B c3ecdc02f7ef8d83a63d4c6077f3ddfa794ff9113428a0686e37dcb281bb05a27a885b0664a3eadeeb2efdab5b51a1164c93fe67954bc3e71f54e1c6bc114c84 SHA512 1a47a36f9ebb4c863dd3d06d19ae1dd18af3b9468561f2b2370f57da8573faf4489ee3f1c9aebc84d867a51a6a7032d1a57a3430b804c5dd5886a0fce4c0adfc
 EBUILD breathe-4.27.0.ebuild 834 BLAKE2B a09da622d4646499b9c537c885b285e8278f300a6716868c4f050e7ca3d0b9a94d4f7a683b07f819e0b8a86e8b7d9def2fca888cb7e284a03a9fdb3e0d80df7b SHA512 a7650e8e0a6bbee6797c8fe0c8e03acb1d0e49c85e4d6bb26899c62cabbae116198e22b2b342438bd67d74d22ffcdfd16f731db9af9611b6efea7c9273d77397
 EBUILD breathe-4.28.0.ebuild 841 BLAKE2B 68d43d13852b87fddfe4eda017fd3129866cb47c4908e85063c0456c9a2868621be0deffc2a8c97e8c260402c0d40f7d7a1ef2ccb26e9367462b1f84eb213ceb SHA512 fef5efc44b25425b3fc4eb99663454b8faf7d47409a77238b6c219b3ccb1bb5541c755960790e2557f8a805d45e48bee2202a2319a933dc0032af3f3fee1ce60
 EBUILD breathe-4.29.0.ebuild 841 BLAKE2B 68d43d13852b87fddfe4eda017fd3129866cb47c4908e85063c0456c9a2868621be0deffc2a8c97e8c260402c0d40f7d7a1ef2ccb26e9367462b1f84eb213ceb SHA512 fef5efc44b25425b3fc4eb99663454b8faf7d47409a77238b6c219b3ccb1bb5541c755960790e2557f8a805d45e48bee2202a2319a933dc0032af3f3fee1ce60
 EBUILD breathe-4.29.1.ebuild 960 BLAKE2B 4b5a961d54c4103990baee8b63b4e6e6851e88d8b68af165793b113117e4841ae62e227ada9375b95facc602b00c27353b2f229a5dac89791ab3ef266270ac9c SHA512 8385147c513e0e5e754b853e5cf15f5cc40168db07fd9ee3a4f623dede57016bcfddba84c51b80ad2abb2eaeeaf975fde6130dbd8c6bf7704564f3b0b57909e2
+EBUILD breathe-4.29.2.ebuild 818 BLAKE2B 188022411f27208756d58061b7165700c928ebf75188e8a72ef3eb6225cf08c889717dd685cfc1318614e5e420639919f685afe940cf5522bf5cf9ae5eb323ff SHA512 ed554d7c0f6293d56ec6f91b277bb7110a9d32cbd8feec666f09441cd42bdff982b50733fe38d773bb8cc2d8a20683d71bf120b60f3ef96866401adbf28bb88b
 MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.29.2.ebuild b/dev-python/breathe/breathe-4.29.2.ebuild
new file mode 100644
index 000000000000..f3976fca0bf2
--- /dev/null
+++ b/dev-python/breathe/breathe-4.29.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="
+	https://breathe.readthedocs.io/en/latest/
+	https://github.com/michaeljones/breathe/"
+SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 71736833c3ae..4b1b0603a691 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 908 BLAKE2B af06f8a46d8c698c9d5461c57f3ee239556f93c1d9f801fad80675eb392b0b4ecfaf6cedd0c3fbbd12eb9fa046c46daeba2cb6c718adac8a002f280381501e17 SHA512 c7bb2ad024b841f8f6ca47eae90404a5e26485713ca5a7bcf4a7c1d94e7fa3f7dd7dc72231fcc35aa7c724f543858b63f808b0a378317e8dd66b99438d91b0c7
+EBUILD certifi-10001-r1.ebuild 911 BLAKE2B b981028a7e4ea0d5cd6aa7561bae0114fde3ab550731b797502afd5a3caa8b1355964be3d6148b739a4ea93301d20b28a45e73138c9eded91f0ec8dfa74166ad SHA512 0de9f77556ce2130c8c90ee062ada09dfaae1476b3bbb8086e5a326d7c5d14e6cebe34bc6b776ad75f84b9beaac7574f4e7f8ecfb0a0e1867609832f7fa1ca6d
 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 1d1d279eaa06..383139c1d2ea 100644
--- a/dev-python/certifi/certifi-10001-r1.ebuild
+++ b/dev-python/certifi/certifi-10001-r1.ebuild
@@ -4,15 +4,15 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
 MY_P=certifi-shim-${PV}
 DESCRIPTION="Thin replacement for certifi using system certificate store"
 HOMEPAGE="
-	https://github.com/mgorny/certifi-shim
-	https://pypi.org/project/certifi"
+	https://github.com/mgorny/certifi-shim/
+	https://pypi.org/project/certifi/"
 SRC_URI="
 	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
 		-> ${MY_P}.tar.gz"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 932d97d8c8de..89255e81fada 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,6 +2,6 @@ DIST cryptography-3.3.2.tar.gz 539883 BLAKE2B e35de90362b24170c4025f67914e60c16f
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
-EBUILD cryptography-3.3.2.ebuild 1940 BLAKE2B c134594c15c4bd282db7a28682f6ba968d0fd3c1110f795dec457bb5cd4dc15b46448aaf64f405baba145ad8d50e0494f7a6cc188248fb2715ad01aec91ec0dd SHA512 43ba7342011798ef09884483439aa789079fa3f1a0324f17434d8fd9fd977f01f9c63b47b586b8d561052d89be8422b5b26eb18d046de89533520df4fc933497
-EBUILD cryptography-3.4.7.ebuild 1950 BLAKE2B 69528d85477890537d05a279c24e0b34e6b74a0cf5b97ce8b180cd82823432c044f72dddc859d60d7e1e46407904d96695bbd9976c80e5a0b0a8b01f7c4a200f SHA512 a64a2e317a7f5d36d655d9cf71f7c096fc9eb0889f854f68ef9bc46273026e4ff5706b195cb5c32d2e7b3f685a97e5894bc26a7ad2e09a47ba42cfd8d1e04a67
+EBUILD cryptography-3.3.2.ebuild 1872 BLAKE2B a31b6dfac777d7f2f5231ace6f6756db1346828ca9a133983f5dc8b53da962094f8f21c6d3ac7fd022887e349482a3b880ba2ff3596dbdcd21917cb86a843185 SHA512 58d9903f52d9e7fef3f5199f458d78a6a3ba4d0c0739ad9c84e961d73d58677d1912a965bbc40d3cb8096e7444efef6b673efd713253370410f812cdf90ecde5
+EBUILD cryptography-3.4.7.ebuild 1871 BLAKE2B 5519a7695f3dab9518287891ee4d90f931f350645a5a435f86a1cba42717eb7583bcc204040b3449af0a9ba4a8226db0b6dd40e92581f4539b07f2d914006564 SHA512 4a570f33b371e44d1a4d6ffbfbb1f073ab6b7a3a8d29efa4f0433e9f8b34921c0677284bfad2341efe312386fdce21075e1487bff17aceb3c884418db02e1750
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.3.2.ebuild b/dev-python/cryptography/cryptography-3.3.2.ebuild
index 47aec5679472..fd7468560e2d 100644
--- a/dev-python/cryptography/cryptography-3.3.2.ebuild
+++ b/dev-python/cryptography/cryptography-3.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl idna"
+IUSE="idna"
 
 RDEPEND="
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
@@ -39,8 +39,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
-	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	>=dev-libs/openssl-1.0.2o-r6:0=
 	"
 RDEPEND+=${DEPEND}
 
diff --git a/dev-python/cryptography/cryptography-3.4.7.ebuild b/dev-python/cryptography/cryptography-3.4.7.ebuild
index d6ca6ec6c213..59b98063ce3e 100644
--- a/dev-python/cryptography/cryptography-3.4.7.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7.ebuild
@@ -16,8 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="libressl"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -38,8 +37,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
-	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	>=dev-libs/openssl-1.0.2o-r6:0=
 	"
 RDEPEND+=${DEPEND}
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 8f6d9eee1a9b..4a13ab1e27a9 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -2,12 +2,14 @@ DIST denonavr-0.10.1.tar.gz 111775 BLAKE2B c96cd3f4597766fdd1d4d5182ad5eadcc3808
 DIST denonavr-0.10.3.tar.gz 120245 BLAKE2B 573e6b97a5b1af102e8e23e67d0edc339d27188f0d233a2890fac37da7848c6f6f28e31ae7b5d9c419aac2512bd29e4320901b16aa3d1ae423b446522bed93a4 SHA512 b025a64e3d97ad6941e1850b66cadc5163b0fef309b6a978f1f823142ec4897f45a47e00726f6a92d1ab22fadaa4c5ba74d955bab7d821a69e3a7dd10435579a
 DIST denonavr-0.10.4.tar.gz 120868 BLAKE2B d4581a35351eb70ad06fafb522591224ca9993fa117ce46fc6bf1b0fb4361cd4a01bb0bedab812d23fe5b626513eee5b15816f25f6f3259dcf72e3076fed8366 SHA512 fb9247ed78a591eaee24a5e9bf9d2051a449d91003caefb0dba939c4f2286376671eb05a68460cbb80590b39c85fb923e014df899274f3fe97c2cdf71a4cea4d
 DIST denonavr-0.10.5.tar.gz 120862 BLAKE2B bea9620d5c4e6f8523f032c041bbfa67d6e756b27cc8f3add7dd24314bc333f2e515bb9d566630a2c72628f8bd40dae3739c205ba991487c5e99cab28070a1ca SHA512 3ffc005812801c08183b1049519f797346675ae1499368e8ee8eddb87e2a14fffa9152fe2909e7cdd6297e3af424fc37afebc860e1e0af36e99609f78cf0072b
+DIST denonavr-0.10.6.tar.gz 124692 BLAKE2B f0af92e0160d0533389e69dfad5740c432d52b3b6446288a572ef62aa9c8610397d3d8d5770ce6b46b4ad224b2782fc8a63a4f548a4237251d52695f5b4dde95 SHA512 336183e04e2f3f98faa1878a472ce69cc2fe7519398b34a61126cd6539ae6e40c60329d5b2f914e3dc85a9dbb11a1eb8fe9669f4e2910838d5ffcee0da7633c5
 DIST denonavr-0.9.10.tar.gz 102045 BLAKE2B 2b0cde47d5ea50b218b04b696756d003494ff92f99ba88509312e1a2a8ce19f0bdc0c51671a7097fa1e7d7f63194d6435ddcfb31d902bf855368d69643c4c64a SHA512 8e0bb6a25eb38e798759dbee301371691c1b34e934054897d65d8829b7f7593044522fe4667c005abcf428ed1234016fb8bbf083e05c51502f722e4d8df3b155
 DIST denonavr-0.9.9.tar.gz 101902 BLAKE2B de30ad9520781eaa66a651f8a77ed88c76daa191f0de716f2cc00e21a8c8ae8883c5aa0c32167754062517763f903949626e04342a2342894a632cb9b94d2e20 SHA512 45d3b4fc6f8487caed0911ff7dd90dd28482de688429b8d0fae68db9a5d78959005ab2aab1b34eab34e964f4e82bccb6d57aadea367f81fc4a7927e54d771728
 EBUILD denonavr-0.10.1.ebuild 792 BLAKE2B fca18b5a9cb941d63c304c381228b449f47032384877693f347fcb08ea34ca2241d7de8c01f408df00ef7cb7d8f957596fc8be4124646df38370f514baa2a121 SHA512 90b6e000ddaf4ffc9e9bc2ab122703c4d43e106c71b27b2f25745fd3b36acfb245c5ab079a2e290b8963cf0a36bcb481a27a6f9f7d7c60c2ec4f8cbc8e6774f7
 EBUILD denonavr-0.10.3.ebuild 792 BLAKE2B fca18b5a9cb941d63c304c381228b449f47032384877693f347fcb08ea34ca2241d7de8c01f408df00ef7cb7d8f957596fc8be4124646df38370f514baa2a121 SHA512 90b6e000ddaf4ffc9e9bc2ab122703c4d43e106c71b27b2f25745fd3b36acfb245c5ab079a2e290b8963cf0a36bcb481a27a6f9f7d7c60c2ec4f8cbc8e6774f7
 EBUILD denonavr-0.10.4.ebuild 792 BLAKE2B fca18b5a9cb941d63c304c381228b449f47032384877693f347fcb08ea34ca2241d7de8c01f408df00ef7cb7d8f957596fc8be4124646df38370f514baa2a121 SHA512 90b6e000ddaf4ffc9e9bc2ab122703c4d43e106c71b27b2f25745fd3b36acfb245c5ab079a2e290b8963cf0a36bcb481a27a6f9f7d7c60c2ec4f8cbc8e6774f7
 EBUILD denonavr-0.10.5.ebuild 792 BLAKE2B fca18b5a9cb941d63c304c381228b449f47032384877693f347fcb08ea34ca2241d7de8c01f408df00ef7cb7d8f957596fc8be4124646df38370f514baa2a121 SHA512 90b6e000ddaf4ffc9e9bc2ab122703c4d43e106c71b27b2f25745fd3b36acfb245c5ab079a2e290b8963cf0a36bcb481a27a6f9f7d7c60c2ec4f8cbc8e6774f7
+EBUILD denonavr-0.10.6.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
 EBUILD denonavr-0.9.10.ebuild 641 BLAKE2B 97d82fad59ce2c8475d4a846714b5d7232136f6b518909acc2404548d94522bec1df9114b2c24d2f56a722130cf5c3d28eb5f3f036b6e787385932897ef383d0 SHA512 bc09e7386064ca14d35f12a5c0639f7ac727ee29d522243d5f1c520ad8709288d5f382b02fed049a5bf13bfb72c47dacd4437923a74b36a0e2dc23323b67228f
 EBUILD denonavr-0.9.9.ebuild 641 BLAKE2B 5d2b116310078139d8717fabe9e9ef3b11001f9e65ac905ad98dbfc033ecceaf8c839f4a83a413540e289015b68a324f31406d7fbb8a628c07f9a92560730fc4 SHA512 a63d635168f4599f3b01bb920493b27ec6a32f461d6c5ac7f8d9149d19884923ac0d3d2777354412c80a08f2546e53f47517c7cd0dbb426901006f195977f612
 MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.10.6.ebuild b/dev-python/denonavr/denonavr-0.10.6.ebuild
new file mode 100644
index 000000000000..744cc8df1076
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.10.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/asyncstdlib[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 9053bc818ea9..aa866968648b 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,5 +1,7 @@
 DIST django-otp-1.0.2.gh.tar.gz 66885 BLAKE2B be98b68f0aa5df25835afa28a23d25e0353dc2d556e62bdf1610a44a409a8e48422e17f274b21eb7cbd421cc4a25a35d01e5d7b3bd99d9caec8c8060da26f57a SHA512 6fe7f79858bdf362dd35e1aeb87c086edd5daf17d4429fc4cb39f3d287ee4c7cf8fb2d6d8f6a7d1b4606104d6732a705b9285f9fec93e4e7c7ca3f3f52541ddd
 DIST django-otp-1.0.3.gh.tar.gz 67007 BLAKE2B 33aed04898afb6ad3940e06436a1d2b4b9349e8fcd55acba0719084939fb9b111e0c266f4964826491f91f832c16f2e4d505486016bfad416706e3e7ef6f3f37 SHA512 7b661228377fa57812a45888e415478cee49d1e343cbc814ba8631f4c354077901ec82f79e69abd00c6bad1dffa026d3e03f4cf0809b074ae1e02ab2cf878137
+DIST django-otp-1.0.4.gh.tar.gz 68976 BLAKE2B 30908c3769ca9c05c850524d8a3b155f7ac8fcfa8e69073622d83808d7b78293604f9b332e59b074a6737188ca4f53ede13d31d283588605ca17f994bf5d4e5e SHA512 7b37fbc56a708f5c26e6204fba344235c7823db66d7e3e56b74516efc8a1de4150c088ce2d94c04c10855f438b077599d361a4d2c2263e8ff2936309dc0ddb6e
 EBUILD django-otp-1.0.2.ebuild 879 BLAKE2B afe469a99ffafd9ddfefd04709b6209380459ab1f0e2ab0ea8335bed19f4c6ca30930efd0a71e1f1e3bf676ac6846d2634dd550e54b4d973ab3b47e99e30fdfe SHA512 b8fa48d607c6669660fbfd4c4705d389e9ef2218571ec90438df9c6704a0744b06ca64fa9d810df7c186c137dbda600cd2ecb00a2fd912c59acf2f9cc760f9b5
 EBUILD django-otp-1.0.3.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
+EBUILD django-otp-1.0.4.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
 MISC metadata.xml 386 BLAKE2B 089280b44d70d41d6ac97b035d5346c7e484d53cb5cc4505a1953d46c2a618140fbc1a3094a14ef18d3c39023ae10b7d162977537b646563459f3a9912e765fe SHA512 6d181b8eaad8df98a615d06c292284c1f8fe28e6bbfbd467428fc387fb9553221646d2014a10c3d16a4613db7d6f0af75714dacacecf1daad0db053d08deb3e1
diff --git a/dev-python/django-otp/django-otp-1.0.4.ebuild b/dev-python/django-otp/django-otp-1.0.4.ebuild
new file mode 100644
index 000000000000..26c9a4b8f2af
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 03d3edb178d3..e13f29cf19d5 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,16 +1,26 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
+AUX django-2.2.21-fix-bpo43882.patch 843 BLAKE2B 9dc2f2330fba2676782775329e23684712ffb14c598ea5ed5c5f326bb4f9378c67e7187ff0d31189bc9ba690eee0fbc7e8c27119bfac55f6ca89cb5a418cf445 SHA512 c2eb24e649c82da5830eb6d82fb6eabb5d46ac1b47ce805171903a20ec4fdab06179a7e6c8e60e2dcdf3299ed397725ad1120f6d2b34de15d0a13b66b4ef18bb
 AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 DIST Django-2.2.20.checksum.txt 2553 BLAKE2B 93b0cb2abdf105a0755b960d5047e473a9a70abf89a73d37e86b846227be377b5b0b9f581cd0c18bdcdf92a7968e3e1cac8203558395c76d40e6b6bf899d2e46 SHA512 d573cfd94ea30ae3403d4e59232421f7f26b3c45c5485497b1b9706f1c41b98dbe31c13c02b24ed66bbf34063fa3ac867eaebc4ebc9da2df5f19a190138b2e3d
 DIST Django-2.2.20.tar.gz 9182853 BLAKE2B e1f3e685bad3b81ea687ff2b63b8cc874e8bc29a87ee8287104f50914839a9cf6c144693787fe175f84b0fb6d05378fc2382b047c1d02f944dd1609410e95576 SHA512 1d72805b3b80c9bc33a99e213f610aaf9ef90cdefa2341d7970499e831a69d2b26e5ce1e1ba1f9452b64ec768bb3f002968ebc7e26b99d5f8a07cd89b72b6870
+DIST Django-2.2.21.checksum.txt 2557 BLAKE2B 76c1588760de34bdd4274eb12abcb60dd476ef1057dd7679ae76f8b7fe916c40c26ab19a821075523c5ae886802af7aa267efafe3d8192ad14ac18557651f5cf SHA512 83d4893e83eaf271f783c177549f8267a2d84969a6d87447f3cb9d9cb36d9acb48564867644c7d95763f9a3888dd9d8647233733b92b432c54e4472f8c34a5fd
+DIST Django-2.2.21.tar.gz 9209871 BLAKE2B 616215d43fc879bd4f01fb6fec7f3fa47c4630bcc961c8606c01a6e25c2ff27dfdf886db7dc03f8445b52957c1ad858fb8bb5e7cd25c97a927646bba436399de SHA512 37d1f58c23907792e49c827fe1efe4345fd5d74ca85b44d1f492d45c9f4f7cc9ebfbd59dc6a142bb24b666fb89e2ee62a3bc3e2242cd25d5c1e801a3f07a2589
 DIST Django-3.0.14.checksum.txt 2553 BLAKE2B 142b407d6573cac8d07a140370123ce3996433742a67907cedff340741f36b0f82fb577a671929a938967b810d25cf2f491ff85241e6a25782e216eb5571c89f SHA512 3c0ec40c42b23d0213df540eeecb3d8dfc8590ccdbd2c5e8fab598a09dff0408364ea3c8836963e94205e0086c96bd64b8a049a62b9250c6b0c5850cf8d834db
 DIST Django-3.0.14.tar.gz 9259569 BLAKE2B 454b91900a9d8cf81f6227adb465e4f9e0da16e4ddab40fa4a1c66ab131832088dd89be129ec97fd70dc8725e826e7da2c657c87c2339db64dd3eba410a91eb3 SHA512 d503f99417479e5c8be928981c14517c519adc88923efaec691cf090b4d9de77424d9ca5dae09a29dae4cb5e962cd86bbfb39cc86c3e910d45bc1757cf169d4a
 DIST Django-3.1.8.checksum.txt 2544 BLAKE2B e62097ab681f16fb9732b656a05edc77673e3eefd81112bb7d362857c81f3d3f16baeb354e48f5989be8044df11440436ea39315d8c5f573968e93a54d310a3e SHA512 7c41575a3ee18f0db07b51a02ec780cf51a4cd375879c368f1b3dca405b13d1fec303bd2b85a38732c4a371c8aee7ec49fa5e12d3e1c88295a8c5e6e65f7b9c7
 DIST Django-3.1.8.tar.gz 9651582 BLAKE2B 00d0b80f2508df0d68e4009297f1251138419da0ded8ba51e85596399ffb456ac7351ed212d0f88a317ebb6b706c5ef3ee39579d9029d567ecdcf3a3af992212 SHA512 2b4df8595778b1436fe0077514f3a51d3e298fcdfb7751c8ba8bb7125ece3199a8269b2da96cdcdb230a39707e122a6d8f48444598fb624d5f5c312b12c2d7cc
+DIST Django-3.1.9.checksum.txt 2548 BLAKE2B 2b733f7ef48b861fd97136a4efa034420e956e506020336ffaec4de7aa7d967d88bcfc5d8574afde317a74f95703378489109334569a84e163fcc635c59378ee SHA512 4558df4393661deb44c0b0c4658aeef3757e8e16dab98b177d0f5102398530dc96d526a955e4f7c88b2d0c40af544e7f9f6deb8d2697c4626c19e16f1860fb06
+DIST Django-3.1.9.tar.gz 9673018 BLAKE2B 6212bb48b31566ed2d87f2bdf7922b6e3e93df06b4f8f7ddb1fd20a1a7465856ccc280dad6885f1d2fbf90c6c1919cbc0830416e82e4123fee1c116561d0631c SHA512 7df6afd2539407727a250a981488c80450b882772ecf0edb778182a828d4c80a47b668e64e6e2adc8d21fcab92aef5322cfae3f386369688087774708e75fa13
+DIST Django-3.2.1.checksum.txt 2548 BLAKE2B 2f5feeffd4cc664e5ef97de2ae1428a9f432f4480fee846bf8abefbecdd4e418736ca700481e3fc6f114d6c62ff083dae60cefee4e5d8481f97f013fba1e0242 SHA512 32cfa9d890059fda32bbd0062b0333bad4b1b616bd555a99870fad09e7d3c662117b4fd5fb98ac7e634daf199434c2f58fdaeb28d895cf714ae05fbf7eef1b91
+DIST Django-3.2.1.tar.gz 9820723 BLAKE2B 968104e3a42310effe8a81b46eb7e17b97aa8f92fddaeef6a1dbee49947d9711daf0c71628fb9c4384a4e7bcb63041a15151f71a368f20934db80513967f0ea2 SHA512 5f3f80047cdcb6c9a07ca0dc9d6d83d190c8c0215311f39e6e441384659c92e4fa42bf4677d297a4ba8520a0bfbd78c4b2ca13cf467c1e1220c0c6a3131ba444
 DIST Django-3.2.checksum.txt 2532 BLAKE2B f36a277a983bed99905a61ab19bff11e50ac253838ec2d9d03fb9a88541d5da530dab60817e6286dcd022cf28ce136c410b06bdd96b96547199d039b3dad922f SHA512 fae42d25963618b68f39218c6c2ed70bf5b0785568e0a7e34a6613015dcf34f433fe571866478dafa601e83150dc10b766186c820e18fd57c213867208fb6800
 DIST Django-3.2.tar.gz 9819119 BLAKE2B 5fdc0a3ee9be8b084427f4fcb226616360eaed110066aa721136045c7139683f94488434c6079e450eec65b06551e3c18d4963ae30eae06acf483a39762c6c82 SHA512 126b9e9e848ed049721163a770af062e829c11d38c8be64288287149e494ac20bb2ecec28055c36cb515fec8c4e574c4e9923b3d7bbccc548a843ce7ff7fd004
 EBUILD django-2.2.20.ebuild 2706 BLAKE2B 41e49f5d4909e96201b0c579446ea8286c535a1413909df280c3b9bad9419d235a30505a574f52a5cdc9dd305d1f6fcc617a0f4916f632915f4199b4bc718524 SHA512 acf690b83af84280291aee0863bade7775a55eb1675119474d14b2bbeecb098efd600c69e0d778e73bf91cfa799ddc8134ada1f71fd9d63ef2cc1a2816ecc3e3
+EBUILD django-2.2.21.ebuild 2724 BLAKE2B 0696b6ccfaa9b482742c75dcded90ba82eb210a5f6fbaa69e1ca21be8f277a16e8ebc5d8b2ae31f7b08c6d94d115e281a8326acb5f0c866d8785985bb406e9de SHA512 68bf20d2b358b4eefbab4ad91c033aaf4bbb91193e7174ebefe7dffd6432d1677de88b85450a51d8c1ca284b48bb8eb82030cdaee172f841423044966b6d8588
 EBUILD django-3.0.14-r1.ebuild 3001 BLAKE2B b9852314c6b6000d6c4ae162e03261e84191199c731958e28f4f16b7fa606e8c61ef0ecc46a235919112df87ec3ee760c3b3f871cdc450c60e2ca713f70f11c8 SHA512 521ecaf1cb103a9988991738caf34fd65939ecadf659e904cf320ab8af42f6dbcec4fe7576e9766bfb9577bdb3d6d85566bc1a6c7fbc9ba077f1d2a600ce858a
 EBUILD django-3.1.8-r1.ebuild 2861 BLAKE2B 71086d10722997410bc5702cc821fc37ac29f711305e60e534cb80b78e199c7e4919afb39e6b60c1c11a53b8deb6ea19a8cd03e185ac8591688903a13fae9090 SHA512 27fd19013603fa5d22cc17e9dc9a8993f89c0cc795c86e96de241e4162a6ebef286a302c631d99455a5a9b1dcac8b606a9a7caa6a40a6cf576bdda72b2b7677a
+EBUILD django-3.1.9.ebuild 2880 BLAKE2B af9c11e929076bffa198482ba9841c48f85c813411683c8b2ac8137fc4ccda6e0eb771cfc0e6e1b88b315bd0dae843588352c813594bd7f49a1d2a5cfa9fd6fd SHA512 4e105cad4916cfc7f81e58af05be9950710d3e97572e44e2bb7896a06204d1ea67afa797281286fb89a706a672533583427aad237bfcd2de2816039b0c324941
+EBUILD django-3.2.1.ebuild 2778 BLAKE2B 8248c327df847bf3ea2fc0d8bb5f6de20c3e17faf55a5dbdd2ab6a625cbc150658356856f27ad580a99f12b7949be4fa9605f2b37eb13602e21f9f0ecc79425f SHA512 2f398b666a890f39f410adac77c75558eecec950db3ac784ecc4190525feb0a6986b331dfb48402628fd65c7a474176aa2211718b5b42ac4ee590c56970c0652
 EBUILD django-3.2.ebuild 2763 BLAKE2B a416f244a82855e58aa04fd1285a50fac33f765aa0d434d9af500be4d8a8f1a4f2a597d5c9144b4f633e40ea77c66228d47e62ebb17cb9283ed5a9c5e1034c69 SHA512 4dae76434de21dbd84513dc776ddff116faae1df7018a1104687ca8f7f42774c11e69b061743a244a50252c907273e8f1d121e1d96a25a75c78436879841c864
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.21.ebuild b/dev-python/django/django-2.2.21.ebuild
new file mode 100644
index 000000000000..243cbdfb039e
--- /dev/null
+++ b/dev-python/django/django-2.2.21.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( app-crypt/openpgp-keys-django )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.1.9.ebuild b/dev-python/django/django-3.1.9.ebuild
new file mode 100644
index 000000000000..675fb2c54902
--- /dev/null
+++ b/dev-python/django/django-3.1.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+		<dev-python/asgiref-3.3.2[${PYTHON_USEDEP}]
+	)
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.2.1.ebuild b/dev-python/django/django-3.2.1.ebuild
new file mode 100644
index 000000000000..f17bdecc6125
--- /dev/null
+++ b/dev-python/django/django-3.2.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/files/django-2.2.21-fix-bpo43882.patch b/dev-python/django/files/django-2.2.21-fix-bpo43882.patch
new file mode 100644
index 000000000000..dc5d333be940
--- /dev/null
+++ b/dev-python/django/files/django-2.2.21-fix-bpo43882.patch
@@ -0,0 +1,25 @@
+From bf04b74b155f91b47ca986543348bdf644f2ffb0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 4 May 2021 13:10:50 +0200
+Subject: [PATCH] Reject URLs containing LF, CR or HT to workaround bpo43882
+
+---
+ django/core/validators.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/django/core/validators.py b/django/core/validators.py
+index a385819510..bab034912a 100644
+--- a/django/core/validators.py
++++ b/django/core/validators.py
+@@ -110,6 +110,8 @@ class URLValidator(RegexValidator):
+         try:
+             super().__call__(value)
+         except ValidationError as e:
++            if '\r' in value or '\n' in value or '\t' in value:
++                raise e
+             # Trivial case failed. Try for possible IDN domain
+             if value:
+                 try:
+-- 
+2.31.1
+
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index ce49b278455b..431ac5513bbb 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,3 +1,5 @@
 DIST elementpath-2.2.1.gh.tar.gz 228166 BLAKE2B 0fb0f338a28d155056bd551dc00e634a00a820945e8147ac8a1eb4811aca9e25c563e9011f1a0de9d2aad5761322fb8d9167b64cc5653bbc4012d0631c81fb05 SHA512 eadeb7fbdaa5470c39a59c8f02047aa8f8e76bfa03087bf2a3206f3fad57ae78da82ccee1de5e6c13207c9e22ca5a45de4c1b4b42c62f8141c8f2bacece02ebf
+DIST elementpath-2.2.2.gh.tar.gz 232791 BLAKE2B c28dcae59d29fe70422b6075a4a9627037726574c41e43947c00ba47054924c179e646a5dc01f2247b72f8c58d4fcfcaf411dfa1970cd6ae1cd2fb9f1f3753be SHA512 3aebfa15ec036674d716e6fc91745a14b897f757ade1df945270d39153ecfa9486d0465e9126a6c71470b191690158a853c3871d493e83ac08e065ce2aed3af3
 EBUILD elementpath-2.2.1.ebuild 726 BLAKE2B 7e48e109a9866b8cf9db8377e64c5e06d6cc604d58d97c115d475d9bb8f61f546fbcee4eb34b2bb619546bbbc081d51a3ca29e314d632b2cbae6b1150b128592 SHA512 d401560eea909571cd7aae0439971c4fb05bf131f2ec5721551e7499a218627da2f9e176b0ff63546f8c415aefed18cb9352dacbfc9874209ff066658fc1ad1b
+EBUILD elementpath-2.2.2.ebuild 695 BLAKE2B 54bba320b7345f8380fd87aaa7c840332849b3bee00dd2f5d5b7769995b429e99b13b2abf2011757431cbab412e83b3de3c6206e2ab4ff3c688389fa77cf16f6 SHA512 6bcd81455895165e4d345638e09185febe52f58091d87e8209ac2d24615c9d8c803a76378a68ebe8ce3600601276a5801b77592f1bf65e4200dbbc5774fc308e
 MISC metadata.xml 379 BLAKE2B 83728e52dcbc4f5794b1d73c968e2f28858cc1e1384dc9c48b5d462f8c50124681691aee7d290b926654cb8453b7b372f81eefc5de785dc43a3165ab8933a22b SHA512 36bf1752608d8d5cb3de0be695774b09c0ac66934928476e8c972e7ec0d163d3e61bafbfdc9f587215a2d8996ca2ddd14ffd26c16791c85c70f5eca7e1e511ea
diff --git a/dev-python/elementpath/elementpath-2.2.2.ebuild b/dev-python/elementpath/elementpath-2.2.2.ebuild
new file mode 100644
index 000000000000..f476ad08f7a4
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath/
+	https://pypi.org/project/elementpath/"
+SRC_URI="
+	https://github.com/sissaschool/elementpath/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 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index cb51f1abf960..ceb4f9fa5d56 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1,5 +1,7 @@
 DIST exdown-0.8.6.tar.gz 5480 BLAKE2B fe383a2092691afdb2a3fd8cfeffb78f62b23bd4dc8f8d5365102084acc8670c9f2bc3e4a0ade95a50ceffc5cc142c39dbd3e505678a238d6f39b82f6553071a SHA512 28cd68ed99d24c79a7764f7603242f2b1426f119864d39424b1326cecc5bc922ed610133099e7d03d384c485f4f67d1fefcaadee4e1f69ac8ece08136eb858e9
 DIST exdown-0.8.8.tar.gz 5523 BLAKE2B b53f23ebf133ad75973298b9b98c3f85f63802a9a302e92dda1446f0d686ba4eecd4fa72056d331b6e6caca5e066ec032a31fbfa3e74c1dba39ed007cf116480 SHA512 f5ef32b15720091c459110d6c9644b8dfcc84f6fd117f8433380704e93848cac0c9a3709d879bc42561474dd46b2035bc2be2f7e0bb5207a40ceb26ce4577b4a
+DIST exdown-0.8.9.tar.gz 5558 BLAKE2B 9fade2918bed1a6f81619e2d2bf13a2459f36e73422e271fc470944006b2fb28d5fe0c7bd01810a605fdae64a3725d96e9ea3b8b39f391a4254292244437f380 SHA512 c1d556634295dc24fb7b4a13ea73aff9a162d96e5f698c3923e87fb6a5a1b28be49d2527d91b861aeb8c26bce08b8ebfa0ad6b02553d8e7c291430ec1f72be7c
 EBUILD exdown-0.8.6.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 EBUILD exdown-0.8.8.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
+EBUILD exdown-0.8.9.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 MISC metadata.xml 629 BLAKE2B d9dc203013d701528ea7d879612250b25fa7c67c3c3378b4b106e848c10d997765d44de372e0ba5b2e34ff44a37ea1cf347971d58c7f3545e60e22f0735e29c3 SHA512 f4f656a6b2ec713b358564715611c69a2eb2292d17dffe58ebe9e450cafb943e9242dc92c63680a9cda78e5be92a7ad6001763fa1edd956fb1094732bd77fce5
diff --git a/dev-python/exdown/exdown-0.8.9.ebuild b/dev-python/exdown/exdown-0.8.9.ebuild
new file mode 100644
index 000000000000..d8894682f3ed
--- /dev/null
+++ b/dev-python/exdown/exdown-0.8.9.ebuild
@@ -0,0 +1,25 @@
+# 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_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="https://github.com/nschloe/exdown"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fastimport/Manifest b/dev-python/fastimport/Manifest
index 11d986ddbf74..f1422f29fced 100644
--- a/dev-python/fastimport/Manifest
+++ b/dev-python/fastimport/Manifest
@@ -1,7 +1,9 @@
 DIST fastimport-0.9.11.tar.gz 41764 BLAKE2B afb82878ea1996894ff71fe99edc5ca26d45f98eedf7a8a6e85af45949e1e81c2112de9fc2c026438306a8a0e89c484063954ba7d2ff9a80c6b71ab40174f8d4 SHA512 e1b7e4897542ef6f33af51e1018340a6807688e44424e4e7e482b3347264d58d4290678cc2cfa230af500a53cabdcf35c9e7b03c8ff0f1ec3e6e0a9e869a1455
+DIST fastimport-0.9.12.tar.gz 41765 BLAKE2B fed4b350c5ff1eda194b0ec89da240ddf1f1bb48e08c16597d85eb443c0ff39b6e0af00c70da14a99fcff27ad6935245e9298b74273f210bc15f01b3aa6ccfd1 SHA512 0beab06145f7898402eff96bbc579515b506d9b7f6f30f77cdb35799d4531f0067b5d368e9245649ca435c2f7742c172c61f75d29a76c2d22fd90cc8d9605ae8
 DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
 DIST fastimport-0.9.9.tar.gz 41690 BLAKE2B c07774916d42a6ad98fea3fa8185bd6fd4e2b908d7eb90ec28a2d7dbe5fd806a97075ba0bb5e6dc4fa3330c9e1e46db125daa11062dba52cc9ebc4486c0fff12 SHA512 15005da2056e0d489f9317138833131ae2067cc5b4acd1ab8e82142c6a71e7cc600c3d5a2cbfc151ca253ba3f6aa5f0328fb45dfa912987bb28d4762248298b8
 EBUILD fastimport-0.9.11.ebuild 660 BLAKE2B 7f3d729234f0f89f0624e850f47980675e9dea498c5debd92fee7e5753970598846bd0be3f21a912fce3ac615b16a0d72859a223a8ea70c8ebc99e44c0aff943 SHA512 efdc0ac66850bb36f6685771c5fd39f656a1236505e9ec8fd6e4db5ed6a002f0b730559ac77b53597abb733995b20908283893ada4e47f34d631c94b5bf0637b
+EBUILD fastimport-0.9.12.ebuild 508 BLAKE2B 690c76a7f6e205f0470f7d959fde7c20af59dfd3a799fa3b66119e7d90af2ae327e3d11d758a0081c6f5b952b67c4c103c891f9782eab42f9303cca58c50383d SHA512 f6a15d2101c4905766fac281076ded3d4ac1d86aea34598180904ce8644cddf43f2420f1acc732df1c7c8937a082b6af4f05b513ff0abc7d25b6e2b49207cc08
 EBUILD fastimport-0.9.8-r1.ebuild 765 BLAKE2B fd9cc0c7818f32052e6079b085dfed2d07aca3e9826dadbe223437538f72d5ae871f99fabe3f01a4f18535ecb0025f91d3bb47ecf585f901de0848d9c00f5e65 SHA512 a690327a037774b8516c679174e6107a1c5116f5d976971e1b67e0d3db01268cfe8e7d0c274d767f23c3203f1e3f4604817627dad1e08d8abd1989d3f582e675
 EBUILD fastimport-0.9.9.ebuild 660 BLAKE2B 7f3d729234f0f89f0624e850f47980675e9dea498c5debd92fee7e5753970598846bd0be3f21a912fce3ac615b16a0d72859a223a8ea70c8ebc99e44c0aff943 SHA512 efdc0ac66850bb36f6685771c5fd39f656a1236505e9ec8fd6e4db5ed6a002f0b730559ac77b53597abb733995b20908283893ada4e47f34d631c94b5bf0637b
 MISC metadata.xml 509 BLAKE2B 23407a89645a4f2fbc0954f2f02eb60c74e8aaf2c7385d3d8c098e64fbf949b66f262378de964c5fae6d84db4e6e04d4000438c8cbf4d44fc629d74e2f524b42 SHA512 2242fe2ba9731aee3face6de5e7fe146ecab037b24825a7fd5ed26bbfcf4136ab50791ccaaea4bcac5a23711fdbcac30e2181a39c8d0a3d33cd7acfe56ea2f56
diff --git a/dev-python/fastimport/fastimport-0.9.12.ebuild b/dev-python/fastimport/fastimport-0.9.12.ebuild
new file mode 100644
index 000000000000..1903c77d28c4
--- /dev/null
+++ b/dev-python/fastimport/fastimport-0.9.12.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for parsing the fastimport VCS serialization format"
+HOMEPAGE="https://github.com/jelmer/python-fastimport"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+
+python_test() {
+	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 577fa0368358..17b5298a28f5 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,6 +2,6 @@ DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f3591822
 DIST flake8-3.9.0.tar.gz 164144 BLAKE2B e265a392445038b04ee2d8c24a763b4b1eebe9682295b70d14c07dbd739b34abbe5f76bc01dd31df7c666a106b62c5312c0522d6771c5649a91d2720a9d14467 SHA512 bfeaa13737f23318da8673c28f0f10463c0aad71a01fe70797321de3b9b7efbe7b5d0ee0664b8440db6b35d7f29f157848757d55fcac531a0c6da6371d681b65
 DIST flake8-3.9.1.tar.gz 164752 BLAKE2B 07f5049f8445bce87cee1509769e13f275f0e531b78a2769218233ac02a45ed7a8dc061f5253e4c136b47bfddfb574527d99dfff36d338516824167335f9a5fc SHA512 c592308fa32ae73982e6441624a989bdc213b639b0473f7342e75f11e3844282a713dce1f4649575d375766fa1d6b2a1840707109ac8d4672c0d2917f89a3d33
 EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 7b0c81113db70735cdb5757df5142aaf6a387133cf2a28c6c89cac1d316a3e632a0f3f39408d14e72a096a57040cb104940dda83b6c0c0c315e4cf7c7046f947 SHA512 a3b9b959da19ca3406c355108d3df65d7d17c7a33bf597e86d34b6fa51891fdff8cfb4831cdda6b36f78af19bc2045025205957bdf98c9484ed3d73968c01659
-EBUILD flake8-3.9.0.ebuild 1195 BLAKE2B 07d56ee894e891b073cb5d6e547f89d35771bad3b775abef2a2b27d91e4c56e2333ae45b1d59ed59a6b1d582c25177157e694bb4fe3c577cb57abb33a1e5944f SHA512 4e92a41c0d0de016ffd51b11d2174320e24ac67e5afd6f1f13abc67858db57c3ec8718fb525b4b235790dfbef5060b518d7f88b1f6aa4d545c27c8acb94751d1
+EBUILD flake8-3.9.0.ebuild 1188 BLAKE2B 19dd0cf5f14bd6f3f9f16cfea0a8093dac3b31cfec0680b04163a38fddac86aa7e7b6bd69322c32809bd77daee78e0f0f36cca2998d3dba726434299aea63e38 SHA512 399079f81978dcf45f6025ba5b6e60f73a70641b239c05f19464b63ba3db58d3e2a3b2088a550706a3dfad04948b9818958a47bd55ee03af757aab49289bcb78
 EBUILD flake8-3.9.1.ebuild 1195 BLAKE2B 07d56ee894e891b073cb5d6e547f89d35771bad3b775abef2a2b27d91e4c56e2333ae45b1d59ed59a6b1d582c25177157e694bb4fe3c577cb57abb33a1e5944f SHA512 4e92a41c0d0de016ffd51b11d2174320e24ac67e5afd6f1f13abc67858db57c3ec8718fb525b4b235790dfbef5060b518d7f88b1f6aa4d545c27c8acb94751d1
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.9.0.ebuild b/dev-python/flake8/flake8-3.9.0.ebuild
index 4b9b899ae918..af15bd9018f3 100644
--- a/dev-python/flake8/flake8-3.9.0.ebuild
+++ b/dev-python/flake8/flake8-3.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index b4c22beae95b..0c03e8538d77 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -4,7 +4,7 @@ DIST filesystem_spec-0.8.7.tar.gz 277744 BLAKE2B 4957b716d622ecd2a1bb381b2912539
 DIST filesystem_spec-0.9.0.tar.gz 286641 BLAKE2B 70603c14d955640251f0922afaf7fa7cd3739c827218cb708fac27883b671e059ef17eb02b4d482904278855d06958e2159b49e232c558f78befd925472bca6f SHA512 68235dc592a7c7e85e5aab1b4409825f9c0a15c6841f96f54cef66c1b6ef166e930b910bd140bbaeb818f2f1f3dfc9a5752f3c479a97b6c5ce8e7d7ea98721af
 DIST filesystem_spec-2021.04.0.tar.gz 288179 BLAKE2B 896982345533fef9593f393209202e0a90473e9826ced9d69854dca20c66c64b85e1b1c44413dda718cdd1af7f41ac821b4d67b600536b32a873a4f73ab32801 SHA512 6806d6fbae89b514955a309346f19b2d199db10aecece728d117798368c311e3fbb38161fd5a54ea4a60ee7e656d2e50fdf8c4444ec3d6bdd761229b4a6341f2
 EBUILD fsspec-0.8.5.ebuild 1190 BLAKE2B 96479c9f48d82e88c9aef43f78b62a59fabdfa34cb7d83ec1b381a511273a8d0c1cfadf2f20e2d0dc5256dfb5a8c908b22f91016745c5e3bbcc848af9feeeb32 SHA512 90d6f4d4251f7fc7724504c0391bcbb0b1f273c03b2b12a9c519309d2e6ee8d0aadb153a3579d63c59f00178bbb7b27f2b672a264b0d7812a9d0cb7d3beccfca
-EBUILD fsspec-0.8.7.ebuild 1239 BLAKE2B 0d3df1633cc92ba479a238392a98986b3b877c0881df094ffdb4c95c00937acbd4476b388574ba9888cccda798b4c29eac3135f10f91d5971301056f3da68cd1 SHA512 2e97040adc6f698510fd109de6ed3a511d6e4e11852885431ed3da35a9d995d42204f719c76d8308e0c4dd574b0016ae68a59d23da674e20a107f2bbb9da8146
+EBUILD fsspec-0.8.7.ebuild 1237 BLAKE2B 3fbc013ac56bc1833ceb348d7d810ffc2b4e1404146816d1ae4137fbcc30ea489983f2c69bef6b08a219b974932cdc1a10104fd0fae4ebc84ddb1b6dd08d70e7 SHA512 2ff73f95b60dfbc1d8c26dfed5fd45e51c75bb65b051c107946022f179e7a60abca7a724b081d729228d4335f85d0a589438e12799a46de01e6b9d64ce0a7428
 EBUILD fsspec-0.9.0.ebuild 1239 BLAKE2B 0d3df1633cc92ba479a238392a98986b3b877c0881df094ffdb4c95c00937acbd4476b388574ba9888cccda798b4c29eac3135f10f91d5971301056f3da68cd1 SHA512 2e97040adc6f698510fd109de6ed3a511d6e4e11852885431ed3da35a9d995d42204f719c76d8308e0c4dd574b0016ae68a59d23da674e20a107f2bbb9da8146
 EBUILD fsspec-2021.04.0.ebuild 1196 BLAKE2B 82cfbe3e6835ce01aff5eb944a83f70746590d2d72d793874d7997ef3ca8afb67ad24c934699e4641bb496f9709f55c00831f8d6dbba370d0cc9894a01450f29 SHA512 536f1540703e35e123c69db1183da475f2e67a142e47b0084d197e5dd84f434a5b829ad84a935f9963c661896183d74444e1181890a10f73515cac62e4009b5d
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-0.8.7.ebuild b/dev-python/fsspec/fsspec-0.8.7.ebuild
index b0dedf55ecb8..a439d54f54f4 100644
--- a/dev-python/fsspec/fsspec-0.8.7.ebuild
+++ b/dev-python/fsspec/fsspec-0.8.7.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index eeba3b54c969..85ec10c1ee80 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,3 +1,5 @@
 DIST fuse-python-1.0.0.tar.gz 46275 BLAKE2B 109202ed60df82a1a637a02627657c27ef48e55225c099385ec4d74554912d89dfd6238922a7588ff8de27e4c700a3b3832e204455997375dc67f6ca36590ae7 SHA512 d5e91be3e43065988053390d97ca6483ce38924bf9a49f694bf911080b7e75c836224e83d09dcbc6fab8d63781b4cd3ae016d66b65b88dd53106b06f91a6ad5c
+DIST python-fuse-1.0.4.tar.gz 46571 BLAKE2B b839043343e5abda2725545c696afd4da847e33a77647d910bc7ea71d17480536770d99899ae8f949734304ea6b4b591934f34476ea84aad1adbe39ee5897fa7 SHA512 48fffc02aa7125df03cf2a5819449a5e10a772ecc737bc8a19199beca6a2f8181b98c91cf05fedd06fc258d846c8d67d073dc1e8620c336a3ae09320688dc389
 EBUILD fuse-python-1.0.0.ebuild 502 BLAKE2B 2b76caf06d1f71174dbad1ad55d9a27983d6534ee8cc2940569cce070725aba29d187c4c04d7a94b43d43b2663ae476da04d5e222269e12caa58e313872b3390 SHA512 ac1ce9e9fe9103282e1c6404f6a5a22253c716b3a43bcdf76f4015c5caf92da1432c055b7c8abcb15fd5cf89b15c316b8fa22acc665a6ca5ddcd1036ce65f8a7
-MISC metadata.xml 290 BLAKE2B 8012b37994a0cb9cc55883ef4ed4a95ddb3e1dbd42041e1e65ba4c2c4176e98e0976a20896ba026e399755d0e37b89ae17ad938eb18a367403dd744f7da89580 SHA512 99e5fc105a72ef2b238203adb7574817f1295515598d032fbbf6be94a8899cdbc4098e40d9132a243f65e44db944823ac2224b3409680dfa5bb3c926a513a277
+EBUILD fuse-python-1.0.4.ebuild 522 BLAKE2B bf694fb9924263cb11d8cd1f6d73b7ff31df83c806d341ee5d83b9aeb4b378af966ba57d3bd6545f65d3b26ea76fdb8a46b10b11e21e494d3ddb24214f8a8060 SHA512 6169fbe023fca8189d5df70330e91cef69f8009f8c75e23b32ccd81d6e2905bb668750b0783bd9cd89bf9ba638994c879665f6f8a1e7cd2fad67b76ea967f3c7
+MISC metadata.xml 363 BLAKE2B 36921699f775e43808704ee7ffb70a4bb6ded7e8a12ddf33cd704648bafa3cf007c366b08239eaa676d563c9a6c672b1a1881ca407b0f16fb3e97e79e63d8225 SHA512 920d3e88dad11ddc0ea9cf1cc4f4d4217c9d28fb12c306c795510b299cb07dc3ed9660c52681cf19bd8564244ddffe4ac891d212f18e50727d0da0f087b0be0c
diff --git a/dev-python/fuse-python/fuse-python-1.0.4.ebuild b/dev-python/fuse-python/fuse-python-1.0.4.ebuild
new file mode 100644
index 000000000000..a79e2094d4d4
--- /dev/null
+++ b/dev-python/fuse-python/fuse-python-1.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-fuse-${PV}
+DESCRIPTION="Python FUSE bindings"
+HOMEPAGE="https://github.com/libfuse/python-fuse"
+SRC_URI="
+	https://github.com/libfuse/python-fuse/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-fs/fuse:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/dev-python/fuse-python/metadata.xml b/dev-python/fuse-python/metadata.xml
index eed99a0e5ab6..b839e729b6bc 100644
--- a/dev-python/fuse-python/metadata.xml
+++ b/dev-python/fuse-python/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse</remote-id>
 		<remote-id type="pypi">fuse-python</remote-id>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 00fcee9f3460..b7614bcd8e91 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -4,9 +4,11 @@ DIST google-api-python-client-2.0.0.tar.gz 23121166 BLAKE2B 427160b34982438ef7b2
 DIST google-api-python-client-2.0.2.tar.gz 23122914 BLAKE2B 0df0b44b2e86088069c5abc1916e733340ccfdb5be7629a2b5f1fcc8e5597183213d2ec149ef64a879bd50710ac804839b7d3be3d912ff6f132473dc6b4050f1 SHA512 9224a1f925ddeedfa0237372b4c5d1dbab913e07a8885398b955ff188decea68ebcde36fdc06394674e31d8ff4dee02aba0e13ebf8f599b1fc19854c21f9ce85
 DIST google-api-python-client-2.1.0.tar.gz 23921001 BLAKE2B 8594d79a0eb71587c2d0d55c3d9bc1414f5ec057594324638947fb408182a58f04a8672bbbfeda95a262ff2888d93e3e103730f592caf4d884d392f8ed894824 SHA512 c76075920a3e56f3d64ada1973ade61bb3806afd63e5bd184074b4a3a16e143aa5662543127e98451a942c6b47e8f9f28002ef52b548fc8702ef703c0da33cf4
 DIST google-api-python-client-2.2.0.tar.gz 24631108 BLAKE2B 377b87d30a0adb2bdbf983e9821e8be5db371e70572d79cafc1c4d231206461d50373b87aed5927cf5a485c3c1b21819db2719107cf58472551a7a0f858d8090 SHA512 9e921aa4b3868f85ecc3eb572d465c13851b1dfa0e84d11706821d5d02511cd4ae4fab4b9b55c606446d5753dccb973a99de888fbfa890aa1fcb6083fde976de
+DIST google-api-python-client-2.3.0.tar.gz 24912943 BLAKE2B 60233808f0f6243c37e8915791975e9aa10fa2d82e54c183582db9712dc36920d7d99f6caa67a25a96b1806ae9f96fd4f371010472b753f7a80d5e4fab49bd3e SHA512 11b9ba2f6417c017d47c9563460c38afdbfd01658e6c0f1812b1cdd1068b04bd37bb362e2ade4214fcc9a89d758f31bc977e281b093793a48641a2b7d926715e
 EBUILD google-api-python-client-1.8.3-r1.ebuild 1396 BLAKE2B fc4b6eb8e14a19a899b780cb8d1191db0ab05bf7d1492a986e6c656410abd791373ca30cf4ad8c0347caefc6a2d4cde687c1c6b9a4c228edaa60787561fd178e SHA512 897f438df59873c4700dcbfe2b4751fd426fa4c0d99fe64ad5eee22b074694e9612809a48631dcb092ee3aa4e98e402318e3c00393ca80ed8b363819fe30527c
 EBUILD google-api-python-client-2.0.0.ebuild 1396 BLAKE2B d1bdcc7680318b5206d46c33305c0e5b8dffef90cb9de16d74cfb3a27f0b18e70119a895a8a0998b16c41a495d264b3ba847941bd5c88989aae1d565fe2d725f SHA512 84bf67f885f5651f1bb22c479762a58a19f708a59b555efbd228c9caee0da021c823530c6542b818e2d1900ac3347af7f8dc765271a6e2f9e47a1d7564b7693c
-EBUILD google-api-python-client-2.0.2.ebuild 1396 BLAKE2B d1bdcc7680318b5206d46c33305c0e5b8dffef90cb9de16d74cfb3a27f0b18e70119a895a8a0998b16c41a495d264b3ba847941bd5c88989aae1d565fe2d725f SHA512 84bf67f885f5651f1bb22c479762a58a19f708a59b555efbd228c9caee0da021c823530c6542b818e2d1900ac3347af7f8dc765271a6e2f9e47a1d7564b7693c
-EBUILD google-api-python-client-2.1.0.ebuild 1396 BLAKE2B 243a8955b1c30837c5b67249bb2546d56169b85d92a65c489fb1de5f5320cb8100b889f4ffed7407ab0a56cfa56b073315fd60d9d71d405d2c9a594a4751cce6 SHA512 cbe65a8037d0a9ff60f8758944521c893081146f2294c2f0d1b6f896daa75e2b0322a99c4aa6630bdca349f30792c210d28e59555a1495282bf738f0add92cc1
-EBUILD google-api-python-client-2.2.0.ebuild 1396 BLAKE2B 243a8955b1c30837c5b67249bb2546d56169b85d92a65c489fb1de5f5320cb8100b889f4ffed7407ab0a56cfa56b073315fd60d9d71d405d2c9a594a4751cce6 SHA512 cbe65a8037d0a9ff60f8758944521c893081146f2294c2f0d1b6f896daa75e2b0322a99c4aa6630bdca349f30792c210d28e59555a1495282bf738f0add92cc1
+EBUILD google-api-python-client-2.0.2.ebuild 1519 BLAKE2B 164b19b659c20337532f296d94a19024020078e6f62ad98142cd8017fc95dfc65cc8011e378b9cff98fab3943c7d1bcb56ea8b9e98a8fc9d7015f7b0d3a0425d SHA512 016efafa8490af176fc7f617c7f281bc34369b72b34f4f4f1d780728a203383331bd264879a95f0d71b8bc0d73e1f2d8d4c2e218c50f2953d1f7907bb607a563
+EBUILD google-api-python-client-2.1.0.ebuild 1521 BLAKE2B 8705a8c639a00233103c0dc9384e0c18a180965572dae36d74053f3c1777ca4e31406207d089d055d764c12c73deda1de963caae8775a30e15972861cfd4e231 SHA512 a4c76f5a50fc4bbc9d23b19b8321e0334f5d454895f2f51bee9be256bca9d91050ff83f6cb2f07476ce7cacc6b9d7fec295bc10694eb234c0bf35861790a30ab
+EBUILD google-api-python-client-2.2.0.ebuild 1521 BLAKE2B 8705a8c639a00233103c0dc9384e0c18a180965572dae36d74053f3c1777ca4e31406207d089d055d764c12c73deda1de963caae8775a30e15972861cfd4e231 SHA512 a4c76f5a50fc4bbc9d23b19b8321e0334f5d454895f2f51bee9be256bca9d91050ff83f6cb2f07476ce7cacc6b9d7fec295bc10694eb234c0bf35861790a30ab
+EBUILD google-api-python-client-2.3.0.ebuild 1559 BLAKE2B e345907554560433de3888b24109ad3103348a620f9f85f0c842fa2350e5c3fcbd4cae21229787b634330a94f916b16bddcfea00cebdcfe49028f5ccd92d945f SHA512 1c0638e7cf57b6e3af304741a6c80408005877abff24e88a161bbf7233ddb28463ca7b3009f2d882758021f8ac2810235bc9986ca19a385fece84b3472e1b004
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild
index f2bb3877647b..c99cd35d27cf 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
@@ -28,6 +28,9 @@ RDEPEND="
 	"
 BDEPEND="
 	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.1.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.1.0.ebuild
index 6ac513eb6f88..57f778294183 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.1.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.1.0.ebuild
@@ -28,6 +28,9 @@ RDEPEND="
 	"
 BDEPEND="
 	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
index 6ac513eb6f88..57f778294183 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
@@ -28,6 +28,9 @@ RDEPEND="
 	"
 BDEPEND="
 	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.3.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.3.0.ebuild
new file mode 100644
index 000000000000..4a2588364e71
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 60c0b54dca45..a1ca3329e326 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-testing-1.32.0.tar.gz 16814 BLAKE2B 70205dd8857256c9c4de8c7a5d115620b908deb4da35fc3cb77d9a93bd42ece34d6fcd2d32d587f8c3ede9bf49e61b9d37aac36ebc1fddbbd6e3ff2ce83809f1 SHA512 3ee10912a090287d3f039f350b11b8fc2ed656939e02a3e616911fd1af838e3f3570a7b3444c0ef54a25797a61edde87d545a9b9cabaf251a862b94100a45473
+DIST grpcio-testing-1.37.1.tar.gz 16930 BLAKE2B 17f30c1c8266ab1fdb363aaafa80a51711be61a76048ff47b09954f0d5ab570d87a1fcff9b3531245c2dc7066e8f71034662ef524aee898af81d922646d3482b SHA512 bb32067abd145dc2b45b29fe2f01ea9cd4c2a9fe76b94f4c5392c26557118aba2e3032b2566809575311e2773a0afd408a3ae656e31deb93e978fb35ad64c98a
 EBUILD grpcio-testing-1.32.0.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
+EBUILD grpcio-testing-1.37.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.37.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.37.1.ebuild
new file mode 100644
index 000000000000..cc55c6572526
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.37.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 72e055a02a1a..724f2a332074 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,4 +1,6 @@
 AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 DIST grpcio-tools-1.32.0.tar.gz 2103777 BLAKE2B f33a54140a5356afb3930dd1ed7d48852744093621d7b252ba74ab9b615c90de36c637d1004689bd2dc3fc86757c9084795586f334a54c3ed45475f2565edf98 SHA512 aad072eb6de60d162d4ed6e353ced9d1b7d72e4ffd012237294fc5839c7d411dc640ea235746057007d289ee37235aa93c8ac23108299ab150c24f99cf050a4a
+DIST grpcio-tools-1.37.1.tar.gz 2120381 BLAKE2B a0a0249166c4f2b0167ea3608f962d0cafae8d7ca7d9085649dc3ef70fb32a93240739c311dbdb59e29c5f1e3319f76f28bc97eebedd37c06b298099750d6730 SHA512 7fa77a822fd242c94547e93aaa7120648a25ddfc0af16a0c1b721e6e2df1fb02a4e29c260e0cd3b35f1b25fa74dcfd42065d0dc34e71fa489e7abbdf2e4ddb4a
 EBUILD grpcio-tools-1.32.0.ebuild 843 BLAKE2B 8605ca43be2b2d03f96214f4943aa8bbfc422a7a65ea2c5cf8a05f04c1638767effdada5a1ac120255f294cd9ab508c259707324a04df0c4e03d33ca2522fd2e SHA512 99774f11ebbd4a4c026ee0ae16d2b58b3f9e68d54597c6259d578191ffda244163444a29ce5893da5053640da4f7ea81f46f452bc9bc5ee41bcad486d6fb4198
+EBUILD grpcio-tools-1.37.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.37.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.37.1.ebuild
new file mode 100644
index 000000000000..3cd4ae36bed9
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.37.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 2324622aeb71..5c6628dabec0 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,4 +1,6 @@
 AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
+DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
 EBUILD grpcio-1.32.0-r1.ebuild 1206 BLAKE2B 9efb8a65a9330cb803fd72fb1002c20bbb05a4c650248eff3c869f2615695deeb8a4cf698cd3cc727708c4e4b40e947ea11c2f391c10fd2b91d6823125e96646 SHA512 2b109be98186b79a61c332bd39a1134a2b3e187f222cfc08c43f69271bb0310ffeaf9deeded15cd1627f1c14d797c8daee652d9823cf7a07bacd85ca1173b44c
+EBUILD grpcio-1.37.1.ebuild 1198 BLAKE2B a57a7c85950f94f79c1e7283263cb716dc26a808a32c1c0a590d6ff9c0009f0fa63e58b7531d9071bfd284108551ff8125ef0e0d2811b712ae428b67b0c55636 SHA512 00c382bec1f5b7b141ac68723de6ec2940b0f612ae26cb11c94013ba794968c67401c2365cd39c0e8c1767f8b008bf6833ca36846063287786b8b1711f28e20a
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.37.1.ebuild b/dev-python/grpcio/grpcio-1.37.1.ebuild
new file mode 100644
index 000000000000..9a037a3b070e
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.37.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/re2-0.2021.04.01:=
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
+	export GRPC_BUILD_WITH_BORING_SSL_ASM=
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_WITH_SYSTEM_RE2=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 004a1772fbb8..d4a551d8dc3d 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,5 +1,9 @@
 DIST httpcore-0.12.3.tar.gz 57587 BLAKE2B 3c0e7a210b21e54564c4c6077fadf66344b887662c71b05a1ad4a2c0224a4d703eccdf576d4443341176edee03b6776bfd49aaef2ea2f29f02614677e1dfad85 SHA512 b31535231dc2b6a5f1c9c0c538628f75360f04b4747b447ab0a7168ed32d0eabd463335c2f7fa782dcabb4cbc32891a2839ae50e0999d5a791c01b02533d38f0
 DIST httpcore-0.13.0.tar.gz 58310 BLAKE2B 29ed4ad768088c6226ece27cb82e2a1d8df32eba4cf446015b43360c330ec65b433f571ac8e13e4b8f8994ff6e097ce5bf79ae1b9561d940298172c66d539153 SHA512 28ed65d3b3b30a62e3f198d98ae77a3cc26bd80250f10a506851433b5572a6fdcab38bf0d670caea94dec43d5b61de21a3ea967a445041536cad68eb98cc12bc
+DIST httpcore-0.13.1.tar.gz 58538 BLAKE2B 4c0b681f96fd64d17bc1974bdb74486fd336f84b27eda450d7de630c9f5dc2012ca91d10c4d0bcdaa06ff0e60d524993ab784721e4ffb55ff2848d68ea9ebb29 SHA512 ba410bf61e820016b061a8cd5a30b227bb75a78e90465459b2ff67dd76b9de9120d3b2474f6d8bb54698f627bb8801f2da5b3d85a4a41a0c5330d6bba8e10a49
+DIST httpcore-0.13.2.tar.gz 59043 BLAKE2B c534c304b238837486b8a61860553475c87363b43842c9dad2629673c1d30c2f906f31658f6ff75bd9354040c08453c3d4ffe8bdf53077ca993399b93d68a57a SHA512 b032d56bc5bf4049d02ca2ddfaf66615a1ac2f0723291f82f9104a0d7f09d5eec710f9e1ac2082fa1e83ef7fa6fe4f5a6c7c28d660abd6803a990094c952834f
 EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45822de6236fca8aa463237631c3aa4b887cf6a583185c70a86ef094428b23e0d7a5fb15947608ed643ed3aeea008 SHA512 f0ad494b042433a60ca1475951aa7ef8697906138af616f8ab083fbd179d3bb79e52323e658f36d92172066017f44be640dd73b4880eaf76a4f6383e739d4a25
 EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
+EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
+EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.1.ebuild b/dev-python/httpcore/httpcore-0.13.1.ebuild
new file mode 100644
index 000000000000..65db85718369
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.13.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="https://www.encode.io/httpcore/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/h11-0*[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# anyio and trio are not in the tree
+	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
+		tests/async_tests/test_*.py || die
+	sed -i '/^import trio/d' tests/utils.py || die
+	# pproxy is not in the tree, the associated fixture
+	# must be disabled to prevent errors during test setup
+	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
+		tests/conftest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local skipped_tests=(
+		# Require Internet access or hypercorn (not in the tree)
+		tests/test_threadsafety.py::test_threadsafe_basic
+		tests/sync_tests/test_interfaces.py::test_http_request
+		tests/sync_tests/test_interfaces.py::test_https_request
+		tests/sync_tests/test_interfaces.py::test_http2_request
+		tests/sync_tests/test_interfaces.py::test_closing_http_request
+		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
+		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
+		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
+		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
+		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
+		tests/sync_tests/test_retries.py::test_no_retries
+		tests/sync_tests/test_retries.py::test_retries_exceeded
+		tests/sync_tests/test_retries.py::test_retries_enabled
+		# Require hypercorn
+		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
+	)
+	epytest ${skipped_tests[@]/#/--deselect }
+}
diff --git a/dev-python/httpcore/httpcore-0.13.2.ebuild b/dev-python/httpcore/httpcore-0.13.2.ebuild
new file mode 100644
index 000000000000..65db85718369
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.13.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="https://www.encode.io/httpcore/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/h11-0*[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# anyio and trio are not in the tree
+	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
+		tests/async_tests/test_*.py || die
+	sed -i '/^import trio/d' tests/utils.py || die
+	# pproxy is not in the tree, the associated fixture
+	# must be disabled to prevent errors during test setup
+	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
+		tests/conftest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local skipped_tests=(
+		# Require Internet access or hypercorn (not in the tree)
+		tests/test_threadsafety.py::test_threadsafe_basic
+		tests/sync_tests/test_interfaces.py::test_http_request
+		tests/sync_tests/test_interfaces.py::test_https_request
+		tests/sync_tests/test_interfaces.py::test_http2_request
+		tests/sync_tests/test_interfaces.py::test_closing_http_request
+		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
+		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
+		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
+		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
+		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
+		tests/sync_tests/test_retries.py::test_no_retries
+		tests/sync_tests/test_retries.py::test_retries_exceeded
+		tests/sync_tests/test_retries.py::test_retries_enabled
+		# Require hypercorn
+		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
+	)
+	epytest ${skipped_tests[@]/#/--deselect }
+}
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index ce1458ce2832..a0940eb14a77 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -2,8 +2,10 @@ DIST httpx-0.16.1.tar.gz 965347 BLAKE2B a6c5bcdda595ffcfb824194564ebd93760a9180e
 DIST httpx-0.17.0.tar.gz 1651681 BLAKE2B 46eec46d5f2006667ab51e5e4d98c1a22783351d9e2fa50ccab2431bf6e52dd9b124d50b32f151fc171561c913d879cfec4f717ea22fd2a333c13190368ab505 SHA512 9471c404c02481a10d42e10e36a55cd55cdecd2cd98a8f3ca1f453a7f1ad7f1ce3b292b8fe583b1c95119f27c0b2eefc756b4e4ed353e3383c12009f3bde21cd
 DIST httpx-0.17.1.tar.gz 1651788 BLAKE2B 445e61dba5a2648191f57352b664a33785af01bb9ca29c7f553d10111894d0b4011a6987bdea880dd3fc87a60ddee7813a2d51e12178277b60ac27ac6fa930ef SHA512 260040e266144f56b8d1cd085e0d97f2b570c685560fd2bc6baca633e8c9e88a666d0ba072048d63f826dd380df7116ce676dcfb48406e39a7480c44f73368c6
 DIST httpx-0.18.0.tar.gz 1663878 BLAKE2B 968ac2a3bd1d150d1adb7e7de5c9dd3aba2ec549feecefdec040d7be1ed54c96b439eff65a4a0d36ebbe77f71af610fc7a0e774fd8dd494a7e80df4e8d0d96c0 SHA512 9648729dbac37500fc828a7cae98a705fa811ae2df0d4abb4bd13a97e03f1ef73b062112c24e7c3edf60140ed5342498a85b46e8cb6b999521ee5d4869656e84
+DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 EBUILD httpx-0.16.1.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b87501897140f8881052db73f6812afb642c23f4ed03365ab3daf6c223625a4d6d7179c4189fd8239fde232cfa2cce5f4e5 SHA512 086f4195cd49cd102d95f7e83add82dd4027b5e6b6b71b858501e058659432b9823b5208aa7e13aac30dc17b69a377624f86f9d313c07e3a460d3443c62e263a
 EBUILD httpx-0.17.0.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b87501897140f8881052db73f6812afb642c23f4ed03365ab3daf6c223625a4d6d7179c4189fd8239fde232cfa2cce5f4e5 SHA512 086f4195cd49cd102d95f7e83add82dd4027b5e6b6b71b858501e058659432b9823b5208aa7e13aac30dc17b69a377624f86f9d313c07e3a460d3443c62e263a
 EBUILD httpx-0.17.1.ebuild 1255 BLAKE2B 32ef44049e9f25d489e9067fd060a27ada135a1af8814246289501621799d156106ba7414e15ab006e1b3efd9e88604b9e8a0c30962e7405aa87ac03b04536c0 SHA512 f584eeb324071170302ee466a6e7c59904937bd10b26943d3d8e184ff42784574414b9f26365da04c68e577f779b93470510acef8462e38df2f90d52e4bc7693
 EBUILD httpx-0.18.0.ebuild 1280 BLAKE2B ae78c0015180a410be632905e8773b118ef999a06cd3fb4e88d1216ce40f28df853183b5c997048bf28ca7c8618e386110b34543e35390fe5b0f7a6d6420dc6d SHA512 dd794d52f2a77aaef254a1fde5afd0b67c8c66eb2c8ab6bb13521224358aa05fc84324208dce60e8f07bc77e470f482e2379f9b32486426f88a00537b4417f19
+EBUILD httpx-0.18.1.ebuild 1282 BLAKE2B a90e0d8e070cec44a348809b55e1ea8288060e758fd5ddb2189a8072ea004449511417eafaa681f1a69c1b5e8bd900be2dd272e87028e23360b92f18debec68c SHA512 c9d000585ebb6dc4336b94351638d002e7e02cb1baaa41f9a8a8d480fb1b9aaa19dca81fecfa62a34aeb74c2454c957ff475e4bbef8507db1b15a776b17754d6
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.18.1.ebuild b/dev-python/httpx/httpx-0.18.1.ebuild
new file mode 100644
index 000000000000..3dec4d445fbf
--- /dev/null
+++ b/dev-python/httpx/httpx-0.18.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	=dev-python/httpcore-0.13*[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/hyper-h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# trio is not currently in the tree
+	sed -i '/^import trio/d' tests/concurrency.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# Internet
+		tests/client/test_proxies.py::test_async_proxy_close
+		tests/client/test_proxies.py::test_sync_proxy_close
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index ab40afe36fad..c164f19c5dae 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-3.3.0.tar.gz 54639 BLAKE2B 7861a5e0403aa9ea047e39f9aa42fdfd7c7f38f295e93b9790f7fea3a86a57e33e65cb302165f1f962a46bf84238fc8b53b2e3e786eb1804b674dca97f959fae SHA512 a25bbaaa8cdd8fc0a7375637c19f91f892b33b8576e4c88b9adc431e976cb4f8937f1f98d71f442547626276c75cb6be445cac9b11b6504b6a444740df486faf
 DIST humanize-3.4.1.tar.gz 56119 BLAKE2B 79f91e03b0c3ab1c645552ee3a0bf321e0ee620f5c0af827e44ba9995c9128638d1dc5cd80e4210de143ab55b39fb25e03abb4afaf5fa9a98973ef6c37d99b2d SHA512 d7e201717ee6b1065920faed3fa70f48c7b6acaf246a707126246d84f516fe7a14713bf4c488b18815907a0926b6cf505f106e15f17051f69756a50f50cea51b
+DIST humanize-3.5.0.tar.gz 56651 BLAKE2B 05095fbdf7c55258bf3d01c73f47bf913e1fda3e6d8a2fcf666f4d70cfd6e437071140716b9f5b6a31c02c06da1d2df6f80d5d021c279d4f97f756f41f3c3bb3 SHA512 ca04d79533b08f1549cd530fec35352696b314d6d667476bf5506a482a4ff379fe6ae021a1f338aa6837877a90e57ce032cdc671b68be34dd52e0e41aad10170
 EBUILD humanize-3.3.0.ebuild 546 BLAKE2B 136da0da80d4e729636d0fb03069009795d282f7ee7aa10e699fc2bcd40df7b035248fce8452ecfeda4377b058a219530d2c7f001db1215ada2fa5ab1b83f689 SHA512 539e9fec04f88a99e85fc83b3ff223d7792b60fc02ad421a7ce485e93776bececfdad27de9fbdb5a12388a3c41097ebfa67418c702936a966efdc7a03638a6b1
 EBUILD humanize-3.4.1.ebuild 548 BLAKE2B 2b86d4aa8a9585e8daf3fcf9a896596ac6104c9f76c9803dfa5934b7f3ab9f13eac36831867941677865f86e27ccd489e7f867e537ce965709c043f137d496ef SHA512 46f45b8ec4517f65b5488e91aebd1c583ca6bf6e51a50d2f7da29fa27dd3dea9bab27e5b0a287be370b6365a4cc02ce7a469f71da74207fe2505c88929776cf5
+EBUILD humanize-3.5.0.ebuild 548 BLAKE2B 2b86d4aa8a9585e8daf3fcf9a896596ac6104c9f76c9803dfa5934b7f3ab9f13eac36831867941677865f86e27ccd489e7f867e537ce965709c043f137d496ef SHA512 46f45b8ec4517f65b5488e91aebd1c583ca6bf6e51a50d2f7da29fa27dd3dea9bab27e5b0a287be370b6365a4cc02ce7a469f71da74207fe2505c88929776cf5
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.5.0.ebuild b/dev-python/humanize/humanize-3.5.0.ebuild
new file mode 100644
index 000000000000..7bc5554aa175
--- /dev/null
+++ b/dev-python/humanize/humanize-3.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index e0d30f4a8813..e9d9f7282658 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -3,5 +3,5 @@ DIST idna-3.0.tar.gz 180786 BLAKE2B f802465ccad978600af0f6b2aeacf4fa56957ccb7362
 DIST idna-3.1.tar.gz 181601 BLAKE2B 1cacc2ad93de4e7f3e4faff72496dd17162a042558c6771d4ed39c68c33087633d6bdd141df3d4f867befde16acdfa82aeb0d70c36b1b1c62bbd0b3b446aed63 SHA512 23c02520d00a99855d552a9b9def529f0baeec7d27e8036c544dd654ade15243fd5c9e5ad02e73b83a9ca3bb335ab2584233d17345a6a5e6d5ac089e8ac81e8a
 EBUILD idna-2.10-r1.ebuild 637 BLAKE2B dfd1ad9cd57e65beea353a73d35e189044a3cdea3e3e8fbc1162c3b40406474d94f43321cbca872399cb8a20246ffc476afba5dc01b3da605f9d2b8a0ebdd19e SHA512 5271722357247bd38397a61df60c4c9fa5d4fff02000878d56eb32ef902affb9fcbda6ca36d5eb78f35967fb968f539c7e21075db5393ce4a560c2a1f4c8459a
 EBUILD idna-3.0.ebuild 636 BLAKE2B d8cc0944c382fdf44b68a6b8f1d4f01621645b5371291f0048c865a1f09bad40c383ce109e8e78137fa84fb69fa759d064e55f794207058c44abb7673e2085a7 SHA512 6b073ef11f170f952cb14639b5223bac6471fda11addd21a20012bdd5c5cc9e3b7a12362ab01273dbc32c0140346eb9a0a39c4e841592cc453454fbe31c0bd0b
-EBUILD idna-3.1.ebuild 636 BLAKE2B d8cc0944c382fdf44b68a6b8f1d4f01621645b5371291f0048c865a1f09bad40c383ce109e8e78137fa84fb69fa759d064e55f794207058c44abb7673e2085a7 SHA512 6b073ef11f170f952cb14639b5223bac6471fda11addd21a20012bdd5c5cc9e3b7a12362ab01273dbc32c0140346eb9a0a39c4e841592cc453454fbe31c0bd0b
+EBUILD idna-3.1.ebuild 628 BLAKE2B da305caf3024d6798b086029cba332da9c673943b3988fc7cb0689ba17e0230d5582c7b30c98ca5ba18d3ed94960555a76619d487efacee6a3917549adfe28ec SHA512 5685c197cbf8e926e3c14e459a8680d91d8974f7b6c6b257447092326035665338cdf072db56474bada44d264450b849ed63316fa8434bc8210665c033d8e860
 MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-3.1.ebuild b/dev-python/idna/idna-3.1.ebuild
index d79f51d5caea..480d29831e14 100644
--- a/dev-python/idna/idna-3.1.ebuild
+++ b/dev-python/idna/idna-3.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 446f5439df4e..bfd15c2059af 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,5 +1,9 @@
 DIST iminuit-2.3.0.tar.gz 371854 BLAKE2B e432da9281c5d50eb306766b65e20a1d02b0fcc06ff0c9dd44f60a8cc840f406e76b4d3c5643a6ab36b9ed0f29f0a327f6fa16b859522853ca9211470691334c SHA512 e3be69040bd5a5d42fcefb5bdc8f20e002eff22fe46d83a9a4cafc66d6772f57169c336c618f9b14bf819042f922e3c37ab88db4dacd36b3d2f1b2ceb8e2d081
 DIST iminuit-2.4.0.tar.gz 372122 BLAKE2B f6590bb67d8c79cb8398345a76a7af7e95bec83864ca950701a97cc3e0543c6b6f2aac8340cd814586328ca519387f592dd45115348a3e5c1096c87799db2f81 SHA512 9c5664cc2b21ccb0f09a63bd5484dc65a6226d385d073f2430a0d5230a3c624694b37adc911e787d87bd6d6541a5d322dcf937a0bd82cdbf9362cb53edb4a7ea
+DIST iminuit-2.5.0.tar.gz 375912 BLAKE2B 422bb8ec8f6a763ff010bd28f695a1b26ef3b3c44e324ffc2f4592d224ba5380d29b47b99d9f8b3f9dd8a5d81ed45197b6f89eb2d2fa599d8d1fdf9e50358e58 SHA512 25ce217ded4f9a142cf0522d9e66efeee4c3bcc16cd1f324a5008c1b64477b2a37a9655ea939c74bc60f9222cae8045bf7a77a5807b09cb3e3e61da4f41e3c91
+DIST iminuit-2.6.0.tar.gz 376846 BLAKE2B 5c5c8ec223ede39ea3c02d3df0639e52047f897eed7b441d567ed3f88656c6ae5740efffb234bbf29ecfa4578bce38a6a5ff4983d738ad1321df35efd0c14acf SHA512 6f413e11d8be3a823a7d12bf1e9197abb27561a15ec29127f6bf4c2339dfc67344b0900522d10e59dbbe1eb08bafb931950b2edb5f5679e06459bdf52abc1170
 EBUILD iminuit-2.3.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
 EBUILD iminuit-2.4.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
+EBUILD iminuit-2.5.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
+EBUILD iminuit-2.6.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
 MISC metadata.xml 493 BLAKE2B 6b9a29fc8851930ad4c8a23ee8e10983f68dd21eec5637efb12cacd6a20b154746333918f6acd81c71422dd3f54128e210448f6ae9710c180939d38c4325840b SHA512 8715ffcb3ac90a2ef0cb20efaefa6375b4bb901c5b7e224702ce951a6dc5b963a64ebd57ad55bc46eece978a9ea4c24124a2ae09dde2315d7fc4a79fbc2154d6
diff --git a/dev-python/iminuit/iminuit-2.5.0.ebuild b/dev-python/iminuit/iminuit-2.5.0.ebuild
new file mode 100644
index 000000000000..9dad35750c8b
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/iminuit/iminuit-2.6.0.ebuild b/dev-python/iminuit/iminuit-2.6.0.ebuild
new file mode 100644
index 000000000000..9dad35750c8b
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 54e23be55b66..c6549bca5e58 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.21.0.tar.gz 5141725 BLAKE2B dae44d481e959ef7d002bdb51d0ab1e2f3eca3449071a2e4161aa735c06fef8a948d80bafd3f2bdd066208437b5ed36615cad5885af453771a32a313fba907eb SHA512 200e41d4e06343b6320f3d106925f6c995f39cf88d01250f53885d4e94d0fd9454a6be4cd7c69410f7dced94b05634f6d2269f9737cc563accf85206d4d7fff8
 DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
+DIST ipython-7.23.0.tar.gz 5143701 BLAKE2B 6672ea3a5bbc9afa38c73acef87a8c8f6d1830e3b949543537b522b809b68b80e5369566c8bee68139f9c3213fbe4c07ad36377a686fe2d26d7bbafd5e54fc4a SHA512 b00b71dbb2851f03f72b6c0e93920afc52cdb3cd5b8f27ba8cca4cb062a0f313db359ba83ba3a9608bca22744efab24c27350e06c5884946709b7fd29536820f
 EBUILD ipython-7.21.0-r1.ebuild 3719 BLAKE2B 08caa9877f87f6dabd1223f92b2b879f679a4f75816d9876d9cc48bdc290500504a392bd0b520c73576f2fbc8fc3c32a734d83317a078e319fbaba50f0caf963 SHA512 05dff1600bd5c9193d1e6067ea588f30c5c69fe1cd5069f00e42dace5b8be1f6994044a0ff91aa34b97bef57378bfbdc1d455fca0589b140aa99347098bd3e5d
 EBUILD ipython-7.22.0-r1.ebuild 3765 BLAKE2B ec5e5ea2f82cf238e22f86af7548af42756deb360bbd11ddbbed6918de4c39109321a46a95b37b06d67daed4d985384b776a342cf4d042c60e59761a8efc3cc6 SHA512 c20991511bbdccf027f19dcefdfe3abfa6d9ca7c45d47f3afe15eb597d6ac8962336d8586302106da6fe7005ad2f3e518615843aabcedc36ec337218a0bdc20e
+EBUILD ipython-7.23.0.ebuild 3818 BLAKE2B 37d0a0eefd4902d1f5b7d6d54d5c95384d12017f133a1a962646e30e839405f467e2b9856c7c102c9a7d8580033e93daaf6e216a33f7d7eaf97a0557e3b57e5e SHA512 a893b56ec0ea66559d173bad90ddd26857a61eb785be36cf519e5e1a5ab70af55248d5ae802e22dcfb834fb87cbeaab9e055df609a32cd0efdf657aa80e14774
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.23.0.ebuild b/dev-python/ipython/ipython-7.23.0.ebuild
new file mode 100644
index 000000000000..2f2dc34fb24a
--- /dev/null
+++ b/dev-python/ipython/ipython-7.23.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 08ae5eb94fe0..c06b8d19695d 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
 DIST jaraco.stream-3.0.2.tar.gz 12784 BLAKE2B c9a9a1f940cd29cde67b624b0b7ac2dd426888f71d29f4bc4920eab5a7ba15713e5d5e57504e9f4f69f25d08a8cb2e2a1024c91c89b8c3aa8bb16023d84f33c6 SHA512 fce486caa9f27f3cfe7775858892d2865fe1c1656a8d369ef9321057716f25d7a737abf2a28fe7827efbeba2daa3b7992ec4fd18807751bf1fee6f48b238ab01
 EBUILD jaraco-stream-3.0.0-r1.ebuild 1288 BLAKE2B 68a93e0bf746149b7e0c8c3c9fe591453922e02fd6f988396a8351abafafd4d61afe4b86eaf6a49c6d84145719fac4ce1b363d70270d0c1e2134146619c7d08b SHA512 4f33d6cb1918011727d1e65671aee9f66da9b2aa6846e3764b16c8efe97423f04d16f177a0722df3577ce70e89b3e95f80663f65cb58e9cb2ad0c47336423805
-EBUILD jaraco-stream-3.0.2.ebuild 711 BLAKE2B 59df9484724f79dc21882e35156a704a99d8ffa5ded85cb33320212faee0bd1e8d45282968217ebe9b67bc2bbf74c85e9726355ae3e206fa999e270a74d18150 SHA512 4fef9ecee1f492e7dfa4bb27b2718ff72cca82c57fe1277782cd57f34966feaa932162fb364ffb0d6a829cf98e69561e62e990ee8ba0d85c239d72d097f5b9d9
+EBUILD jaraco-stream-3.0.2.ebuild 709 BLAKE2B 3bf1d6273ed969f6569a1058d6e5483e37509b97eb19d0862f251c93da921710dd4b3a038261c57580ee48aa904c011e53278334a849d61d0842b85ed8c0be38 SHA512 aca092fc8b0e248b2d1baa964012f8b34f873669ae7d12d6706dad0749327d8d88951c11e1470d0a5c8a2ba6abaa15adc6be89a271bf9cefe3f4ac2c1a9b55d1
 MISC metadata.xml 626 BLAKE2B c28ab97500af030d20cc155fd74e8b918f68c84c0335b1a104956db4aae0801f028ccf46d41aeb9ace3618ec77bb2c19f2917150ff6f6309a82b507be57cf3c2 SHA512 2b870ff52a49ab3e2f81322dd811fa1603341aade274f12b0485f2af7f8d0794873a4801a9e648de632eacba61e45f433a0624aeef283add6ffced35c19bece1
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.2.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.2.ebuild
index ddea28b787a0..041d7f000c9d 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.2.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.2.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index a018b2a28b20..cb58e86c33c3 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,5 +1,7 @@
 DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70f153a0d9deba8b39ba3317df358fe1ddda738f320ff689a7a8965ab157fefea7eb121ea980c6a6d8ca1b42d63941c9 SHA512 277be4e6d56d8e2747df434518d6d7918c149a67c3f6af3f978858be86f3fae9248989823c2429dbdff4a1c1615753607f5487fd9d6705cfafec698cb9d47e4b
+DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
 EBUILD lark-parser-0.11.2.ebuild 621 BLAKE2B 13609371418dba6d3a11da93e4dec266ffad5b281e2166f502be645707303926c1d7855bee3176e86240cc2d98a679a66a51198069448796f239a24130686040 SHA512 0008e3e37ba77243a566779a0c69853df389e1dab5957ed68f606b263cb178851d25435fcea3cc4b476e87b78174f4c52effc242c5524727f831e30c6034454b
+EBUILD lark-parser-0.11.3.ebuild 668 BLAKE2B 4d7a5e9179dc056ba8419737d9106eda1330ca09217c7ddfbfa82f14b399fd1697a5d31045783c50117ad4d486aaf5ce898e58d9a2b6ab663c0f51fc4d620032 SHA512 d4c606ce536a0d30d1ad34c622f6d62a5703e5f8c306c9c12b594e01101d843d890900985c1bea3afdfcc022d4f4cfda91f8ee6adbcc7125443685644bbcdbd3
 EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 5605f1497ae47ea1496f40fafd16eeae8de06af7dc57ed676a9edef923542bb6dd0341adddecd26403d3031b16236298b573bc993c1ead949e1b2327713c5715 SHA512 af78a75077dff7bb32690c6b49959287bbd60e74ea82b8faa811b69501990f4f4b5acea98a6750cc7b3f16ad5af4ebd4a255b7a1b34d6fa191c908c021744a6b
-MISC metadata.xml 533 BLAKE2B 5fd09d685663433a17206fbffbd3eb2d94f0d9a4d90ca5be3915a24d6390da7788b28dd718f5ba0975d1e3402aeb666039bbb1c38948bfc7b145f3b1ea5d245e SHA512 59872af1a85b64f0ac2a0afd7c72af7e43102dcb9cc10d4ed95cf65fee33a6240fe471f52bc91ea679960cdf89bc181d898b7239551071bd96759a8cc788e063
+MISC metadata.xml 634 BLAKE2B 579a43df551ac45d8653d586c6567aae74c77dcb49aa9a4acfc2940ba975629aacda078b1090ae54ffc4dfed6b771b4d9f231970cb999db3367a32c45baa7051 SHA512 f9220665198522f359ddce8a72bbade74346be4e74632fc5764beb0d386965d6e7a88d1366dc968e330394a4a367059ec08c2b3b48839789b1b271657be5c49f
diff --git a/dev-python/lark-parser/lark-parser-0.11.3.ebuild b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
new file mode 100644
index 000000000000..9e3a41734141
--- /dev/null
+++ b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="https://github.com/lark-parser/lark"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/atomicwrites[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/js2py[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/lark-parser/metadata.xml b/dev-python/lark-parser/metadata.xml
index ee09f2e5e2ea..c5e5d893364a 100644
--- a/dev-python/lark-parser/metadata.xml
+++ b/dev-python/lark-parser/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">lark-parser</remote-id>
 		<remote-id type="github">lark-parser/lark</remote-id>
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 6f0044393883..1bc66c913655 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,6 +1,10 @@
 AUX line_profiler-3.0.2-python3_9.patch 1058 BLAKE2B 0d0bb5c9e845d8d30ebec532108fdd0241710494ac22e675f36f1ffed2ef2736d3adf35b32f9efabe1f6e70d986a332507283ba22dede99182573ce158809082 SHA512 448d629790b934f3edc7a3e40d18d880f289d77fe9530cbe252b8b01e8473effd75eaf3ae1c0c26427c27c7193176932e83a69fbc64c2d6107366a5ba974dc87
 DIST line_profiler-3.0.2.tar.gz 45185 BLAKE2B 04e617cc7b6c9686192281ab1cdfdef2cfc6ce3c7aa6b9962ed2369620618af8835b93bafe89f8d1288b45d4120d71f728ec577d5c5d035699c2d7a49d6be7c1 SHA512 9a5d1821c02fc063081854ba98a17eca21af65d5aecf4ce32c67806d31bf0c936291a30409845ce6f94211cdaaaf0859ab5e2b437e1a086fd4f60fc2a0fd2742
 DIST line_profiler-3.2.1.gh.tar.gz 54639 BLAKE2B 8840ac41397aa5d5c0cb94dec5f673a021a9bad18a7d67d73a2d90bf59745c5e35f205d67d28edd3ceade075320c6fe00426d5cf536b9b2953fbbf90539a5e9a SHA512 6e4e0fcb44df6a4eeafa66e8254e511ef0a0c616e9c2bb4bac6bc29df5efa1849f9e75e998770ec6fbe62916a22b17465cdc6eeee6c61ffa52658a9bdb773490
+DIST line_profiler-3.2.2.gh.tar.gz 50780 BLAKE2B 79c5f7f73adaf940e34f96ef799faf08e7a6218cd9346dc3aa86211d04f0cdfe309de23d11f43292aaca121e78df27d0d07ec3efd129e1cc6778b6f8ae83cbbf SHA512 a7279db406adfdae08d375fa18869fdc2276fe360ffb791aa65b13a028470504cd45acfbaa7ccb1c44fb1a5622d9400c5a889f13230514b9d392f09b439af0fd
+DIST line_profiler-3.2.5.gh.tar.gz 50934 BLAKE2B 2124fcb5cba9b0eebe81da6f966eb12e17f1a44db8beddab6903dc7ec79441cfe1d207786083f96100e2394cc2f0274460353d7aa6ce75a6f301500332acbb47 SHA512 ee72df835b55a26c0cd150356da19f8051013e5ffc1a18a31899c9da06f40e97175368204dc23ed21722a237612c1089cb18628715151ab07ba5827e460befeb
 EBUILD line_profiler-3.0.2.ebuild 1200 BLAKE2B 1949ae0c2051ece27545485b1a4386c21e60e777bc857f7ca6bfa7a222b5a39759ccfc0e3d73bf7cdc8b2d14800e3cea7317f321902814913371e68f46eedb11 SHA512 86e3c9df28b8715539d3a6e2de1c79657fbc754a5831f25bcba5280f302092c799c82ec1114d82460b636a74983d7d85d18f57a937a4c7b0ff9e06c3a030eeea
 EBUILD line_profiler-3.2.1.ebuild 1104 BLAKE2B 1fa42fc95ce52fddf76ba7a15f63803d2ce9eb714579427b3ed60dcdfb2be4feff5f7f85a2ec8b4fe486a410a5acad59033bf6324dfbe14823afc0e887d46dd2 SHA512 8e0d41543752019d7191132cb720ec2d0cf5a230a44946da26143bb4b7131b8070f6409170f154196784e8cbe6bc0913dbf604438bdeae28d099ce2983b57489
+EBUILD line_profiler-3.2.2.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
+EBUILD line_profiler-3.2.5.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
 MISC metadata.xml 774 BLAKE2B b6b3a12e779bb827902f69c9ffad89290888d7b446489dc54f22bfe8d21547e730b694ec552b9a9004c764db543b39a8daca8cc0a28f84a5800c8555f4809033 SHA512 c63fbfbf0e20463e78bb8ae15cb9241b1122a80d7a909ed3fefaba1063325a564139f2556a09b0d394cb8fdc32ce34c5020b807c22ad38e5cd8008525fe38a5b
diff --git a/dev-python/line_profiler/line_profiler-3.2.2.ebuild b/dev-python/line_profiler/line_profiler-3.2.2.ebuild
new file mode 100644
index 000000000000..d9613ca310d6
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-3.2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+# force it to match scikit-build
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/pyutils/line_profiler/"
+SRC_URI="
+	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+# technically, the package claims to support non-scikit-build build
+# but it's clearly unmaintained and broken at the moment
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ubelt[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd tests || die
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/line_profiler/line_profiler-3.2.5.ebuild b/dev-python/line_profiler/line_profiler-3.2.5.ebuild
new file mode 100644
index 000000000000..d9613ca310d6
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-3.2.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+# force it to match scikit-build
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/pyutils/line_profiler/"
+SRC_URI="
+	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+# technically, the package claims to support non-scikit-build build
+# but it's clearly unmaintained and broken at the moment
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ubelt[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd tests || die
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 18f6ab161179..542c2374b076 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -3,5 +3,5 @@ DIST llvmlite-0.35.0.gh.tar.gz 228089 BLAKE2B 5cee01244552cfc1c2ba979709170484ed
 DIST llvmlite-0.36.0.gh.tar.gz 232059 BLAKE2B 2d1ace28003d52271fb20f086ba37bec1f2f72c0092ea7a8fa2a1ee8d30c319f9625938a8ebdb69dec5dec63d5a67b598a071401e5e1db9de973d55fd889dc8a SHA512 a769255f276e429def4d6f8d35d516df3ae3e026fb8b4af33c1695a9ea24c64a84c38943b530756c4ffc5c619611158e947de391bba501223dbf2a4cd21d53c0
 EBUILD llvmlite-0.34.0.ebuild 1354 BLAKE2B 54b3c4532cb14dc86452f1f4c4feb5f514928b28d65058011bcf6d324ef66c5a406854d780521e3b495ecd38540b3467a525464b7fc7f94cbcc70b18bd1ce647 SHA512 50b07c9575afd16f03810a519fc3646111c6071567cfaaa538690240bf578c5ab076fc80c26fe12a061d283bd681ee709482aee4c8da642621354b22437bfacb
 EBUILD llvmlite-0.35.0.ebuild 1355 BLAKE2B ab309fb8dec4f96fd85708aa99b0df199f3d25f5e6a3159f387dd65eb6a7357a8075849d04ac89414eef4f3d9e2e65876c471485a0736b97ff60c1451e65664a SHA512 186ef8e395d2c6b8c3d8e9546701cfd0a03a1135ede981a44c72c762a49dcb6e904163b73051979c0e683cc27f0a2b4ca741e938dfe853266b1cf81c41415aa6
-EBUILD llvmlite-0.36.0.ebuild 1357 BLAKE2B c4423fcaf18372510aeaf3753e04171ae956d37495cfe0ee26984a7129f3eb6ad75c6d7d4032567cabffc5a76d99ab2972cc3f362315a87de22b34a1507c30b8 SHA512 ab2c34daa5ab05f6467579cf89dabfc734bd85860fb1f0ebb52ae5186507c8072214f960f2bcbdc6f7f53035c7b06f57f547be03fc7582c9e375d7132cd20e9c
+EBUILD llvmlite-0.36.0.ebuild 1356 BLAKE2B c7cc8aef7f73033395d1eb7bdbd8efc54f8192c214a7c0837a120fb329ba53eb67031beb2ed53abd8ea60d7cbabdf255280830bda73c9f56289a10d272f2784b SHA512 4f20e7eec97f8fb3d43730b3789d13e862f257db85d65f32ee9ec9be754edb1639bb320bbcedc8d9703ebcf0cde031b95d43bf7141a2fe1d73be7be7d3900bbe
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.36.0.ebuild b/dev-python/llvmlite/llvmlite-0.36.0.ebuild
index 8ea52ec82e11..9471ea6619b7 100644
--- a/dev-python/llvmlite/llvmlite-0.36.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.36.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=10
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 0d054027bdab..e3f915252629 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,10 +1,9 @@
 AUX m2crypto-0.37.1-openssl-fixes.patch 3074 BLAKE2B 3daa583d4f7e04840a9c2f15fc583dcf8e4ee996aee93d9c180ccc4920f36cd2f90e2f2591732597b0108f3944cb3b22d0eb202c8dfd500fccb8e805aa74666d SHA512 fd73a98592026b39341200fc378042b71272dad4c43c63e4da3aafabae4f5a8aadeb41738ca99cca87ebeecb5455abadfe96d0c6640702b14f138f8122dc57ee
-AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
 DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
 DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
-EBUILD m2crypto-0.35.2-r1.ebuild 1412 BLAKE2B 3ebc7eacf9a3c1856baa7b6840eaf8350c9a8282fc07469b6bfd85425d3cd50c4112d178d22ad793992d860bd8712b276e2ae4700fdc4bb90f9dc573ec623d2a SHA512 1b77d2436aad5efea0e2b8afe7b501f86347dba601e32fdc2b09e88a64a378ce59737b5fdf4893f3a1494d85fa5ad05066454910129e9f7d5f65e3116409c008
-EBUILD m2crypto-0.36.0-r1.ebuild 1543 BLAKE2B eaa6cfa13143cdc26b0bd42d01742a5b51213419c5de03bcd2d9cef04ec01c5d77da6325ae8452b6ccb0682ad2520f98b75eb60c0e53fe6f5b3bbd05605b7865 SHA512 464263a00453564f4a729b3e3d403b555ca6d19835d7727d775fedcd2179b0f7ff781cccd1ae5e61af5c9930117c854232c34990735f510334dd1859a349f37d
-EBUILD m2crypto-0.37.1-r1.ebuild 1518 BLAKE2B 6a5f677520198c38d4f461c1c88852264c33890e458367378d535e503773e629aa06ed867f1ae67efdfee4cda1a0d542f214a9c6d4845b32bf4089a9c743c9bc SHA512 b40fe56c621a730baf3186cb3e5bb3ad69e401e5caa8d7ef721e1a2c33a95170e6c4db71acdde610b69003fed3d9caacb24e6094f3d548c6867c808a7cfa5546
-EBUILD m2crypto-0.37.1.ebuild 1524 BLAKE2B 054203de4f7b81f9083440bd2e02bcae9fb713d1c1d498f69728b2a0ca1a53d94898d5a08673ac78785d78242311d5ac384d38819852fed0aaf1b60599a6706e SHA512 ccdcee7b053971725b71392cc854c984f524b0db06263c4ff0a6e21b77e3dc8106ee9cb3fa0fe3b623eae8f4c233b9d7328f8df96b86eaa0642f33242de16eeb
+EBUILD m2crypto-0.35.2-r1.ebuild 1289 BLAKE2B 376878f2a67c9e9ef6b2ec628fed337f521567e107c63bad62bd2e751b46c0bb9ad74dfe41abcba137beadfe9d4a34d72582b4a1460bb0112eb78c3099893931 SHA512 852ed45c0773ef735dd11efaea31e90e4cbde198cf2159dab524a055f404b6714eb302f90d9a300016a1884fe807084d9169e95ecee77253ab5da89f64c76c42
+EBUILD m2crypto-0.36.0-r1.ebuild 1420 BLAKE2B fb4ca5fa9c710aa7605003eca2bf1b96e3c423b7521ebb43bbb16ac78fd9f27ae411a6ae0b06942bb099a659847f4ebdd0f71c755dbd913d8df6d7bc27d3850e SHA512 1858b478147e291e86246a1d23e6147d8e9e2a8b615d1e242cf2c23dbfd434482ba771eb13e851a9644e1908574d2f8e2d5cbbe9df2f3bc6348585432efdad1c
+EBUILD m2crypto-0.37.1-r1.ebuild 1457 BLAKE2B 9581aafee67b42758fb9b09e7b0db9df9719c33a2728ef5d07841ce2da4299ab7e07a6872455124b76a75778c22dbf7da6a22ebdf3f09181bd738dc4b61b8434 SHA512 1ece80dd6c509de35abfa97a3f499cea202e234d5e6e6b323b25e5ada7b0b7300b4ac5086f9cb3dfbaf643f1b66a6bed2c74fd534975cdf3e2ca023621c9f2c6
+EBUILD m2crypto-0.37.1.ebuild 1408 BLAKE2B 7dea42ac2fe95c5a740cd723bc2b6f583b58908102e3b748a808dc612ed8f11ebaeaec0cdabe3b0d24febbebf9f029754637366547dccd16777dd84914c46fab SHA512 a6f0fb112a0d5c476393125087830f29ee37a500e3a35d146aae02cb359b0521db4412c8931755bbd286f876ac0e6fe3dbfe4c89fc2c30c4d73ea1bfcd5a5b84
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
deleted file mode 100644
index 10ed142b33e4..000000000000
--- a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From fa56170c7adf5f124a48cf1074390adfc697272c Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Wed, 9 Jan 2019 10:15:08 +0200
-Subject: [PATCH] Fix compilation with LibreSSL
-
----
- SWIG/_bio.i           |  8 +++++---
- SWIG/_evp.i           |  2 +-
- SWIG/_lib.i           |  2 +-
- SWIG/_lib11_compat.i  |  5 ++++-
- SWIG/_m2crypto_wrap.c | 11 ++++++++---
- SWIG/_ssl.i           |  4 ++--
- SWIG/_threads.i       | 10 +++++-----
- 7 files changed, 26 insertions(+), 16 deletions(-)
-
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i
-index e85a275..8eada82 100644
---- a/SWIG/_bio.i
-+++ b/SWIG/_bio.i
-@@ -293,7 +293,7 @@ int bio_should_write(BIO* a) {
- }
- 
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -325,11 +325,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x)    b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x)    b->ptr = x
- #define BIO_clear_flags(b, x)    b->flags &= ~(x)
- #define BIO_get_data(b)    b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
- 
- /* implment custom BIO_s_pyfd */
- 
-@@ -515,7 +517,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void *ptr) {
- }
- 
- void pyfd_init(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     methods_fdp = BIO_meth_new(
-         BIO_get_new_index()|BIO_TYPE_DESCRIPTOR|BIO_TYPE_SOURCE_SINK,
-         "python file descriptor");
-diff --git a/SWIG/_evp.i b/SWIG/_evp.i
-index d04e806..6fa9b38 100644
---- a/SWIG/_evp.i
-+++ b/SWIG/_evp.i
-@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
- #include <openssl/rsa.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- HMAC_CTX *HMAC_CTX_new(void) {
-     HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i
-index c84b800..807d5f6 100644
---- a/SWIG/_lib.i
-+++ b/SWIG/_lib.i
-@@ -512,7 +512,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) {
- %inline %{
- 
- void lib_init() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-     SSLeay_add_all_algorithms();
-     ERR_load_ERR_strings();
- #endif
-diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i
-index 1ec42dd..4234004 100644
---- a/SWIG/_lib11_compat.i
-+++ b/SWIG/_lib11_compat.i
-@@ -8,7 +8,7 @@
-  */
- 
- %{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <string.h>
- #include <openssl/engine.h>
-@@ -24,6 +24,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
-       return ret;
- }
- 
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
- 
- #ifndef BN_F_BN_GENCB_NEW
-diff --git a/SWIG/_m2crypto_wrap.c b/SWIG/_m2crypto_wrap.c
-index 0f07702..f168822 100644
---- a/SWIG/_m2crypto_wrap.c
-+++ b/SWIG/_m2crypto_wrap.c
-@@ -3838,7 +3838,7 @@ void threading_cleanup(void) {
- #include <ceval.h>
- 
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <string.h>
- #include <openssl/engine.h>
-@@ -3854,6 +3854,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
-       return ret;
- }
- 
-+#endif
-+#ifdef OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
- 
- #ifndef BN_F_BN_GENCB_NEW
-@@ -5315,7 +5318,7 @@ int bio_should_write(BIO* a) {
- }
- 
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -5347,11 +5350,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x)    b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x)    b->ptr = x
- #define BIO_clear_flags(b, x)    b->flags &= ~(x)
- #define BIO_get_data(b)    b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
- 
- /* implment custom BIO_s_pyfd */
- 
-diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i
-index 7257656..40b0582 100644
---- a/SWIG/_ssl.i
-+++ b/SWIG/_ssl.i
-@@ -27,7 +27,7 @@ typedef unsigned __int64 uint64_t;
- #endif
- %}
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- %include <openssl/safestack.h>
- #endif
- 
-@@ -261,7 +261,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
- }
- 
- const SSL_METHOD *tlsv1_method(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     PyErr_WarnEx(PyExc_DeprecationWarning,
-                  "Function TLSv1_method has been deprecated.", 1);
- #endif
-diff --git a/SWIG/_threads.i b/SWIG/_threads.i
-index 69adb9f..fd2285a 100644
---- a/SWIG/_threads.i
-+++ b/SWIG/_threads.i
-@@ -5,7 +5,7 @@
- #include <pythread.h>
- #include <openssl/crypto.h>
- 
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- #define CRYPTO_num_locks()      (CRYPTO_NUM_LOCKS)
- static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
- static long lock_count[CRYPTO_num_locks()];
-@@ -13,7 +13,7 @@ static int thread_mode = 0;
- #endif
- 
- void threading_locking_callback(int mode, int type, const char *file, int line) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-         if (mode & CRYPTO_LOCK) {
-                 PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
-                 lock_count[type]++;
-@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line)
- }
- 
- unsigned long threading_id_callback(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     return (unsigned long)PyThread_get_thread_ident();
- #else
-     return (unsigned long)0;
-@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
- 
- %inline %{
- void threading_init(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     int i;
-     if (!thread_mode) {
-         for (i=0; i<CRYPTO_num_locks(); i++) {
-@@ -50,7 +50,7 @@ void threading_init(void) {
- }
- 
- void threading_cleanup(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     int i;
-     if (thread_mode) {
-         CRYPTO_set_locking_callback(NULL);
--- 
-2.20.1
-
diff --git a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
index a96e594465a2..20ad917a37b9 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
@@ -16,11 +16,9 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="libressl"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	$(python_gen_cond_dep '
 		dev-python/typing[${PYTHON_USEDEP}]
 	' -2)
@@ -33,10 +31,6 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
-)
-
 swig_define() {
 	local x
 	for x; do
diff --git a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
index 7bdd305b75f6..221b4223b392 100644
--- a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
@@ -16,11 +16,9 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="libressl"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	$(python_gen_cond_dep '
 		dev-python/typing[${PYTHON_USEDEP}]
 	' -2)
@@ -33,10 +31,6 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
-)
-
 swig_define() {
 	local x
 	for x; do
diff --git a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
index b536accf6bbd..af9a680ac8ae 100644
--- a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
@@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="libressl test"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -25,8 +25,7 @@ BDEPEND="
 	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
 "
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-python/m2crypto/m2crypto-0.37.1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
index 33b0214c3a13..e4bd5539a6b2 100644
--- a/dev-python/m2crypto/m2crypto-0.37.1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="libressl test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -25,15 +25,10 @@ BDEPEND="
 	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
 "
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
-)
-
 swig_define() {
 	local x
 	for x; do
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
new file mode 100644
index 000000000000..65d6b5c81649
--- /dev/null
+++ b/dev-python/matplotlib-inline/Manifest
@@ -0,0 +1,3 @@
+DIST matplotlib-inline-0.1.2.gh.tar.gz 7340 BLAKE2B 026c08d8a96d4402a1b70e50f1adce2b620c17b00d9e4dc365540c41b2d8f189a73cf6c65c8946ae45e7e5325321d28918692c2c6b5f81668fa56fedb40fd425 SHA512 e6ac7efe10979afb773b75c4d2ee321c52b1e9788a80703d063b0936b4989946aa35206ff7e8ad4ffaf6c1116d893de9516fc033f53685ad3a55d8f1a9a8fd48
+EBUILD matplotlib-inline-0.1.2.ebuild 510 BLAKE2B c99fe1dcee0fdb3169e5ff2b7522e496c537647efa1ca9691f212fea122d51956d075084e6ffc678afe9de3ca96dd09d15ea7c0ae3a841daa73d0fc8eeff84b3 SHA512 c07deba2ce72490f030e0dd4f25807afedc8c1b96bb3be7c75a3d12bbcdcc781d70438452e8152e573aca2eb68d530a3d60bb41dae8613e16fd8f0a4ec6dfe4a
+MISC metadata.xml 363 BLAKE2B 3cca406a8e51346ecb5b3dbb3de8a0e3bb82a09243afd82f976d4ebe19207d11487000752cb20601a3e190ed2673dfaf8ccd37bfdb4b53a1b344fb8be2c8dfcf SHA512 eb9935d48f30a722f73335aff5bb53a539002d3018249ca57006db40621b6f3ed9af0d02596c5938c97bf8b28aa7bc3bdb2c0c14cbfa60a08400b95fd33b67de
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
new file mode 100644
index 000000000000..e9b94dda69ff
--- /dev/null
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Inline Matplotlib backend for Jupyter"
+HOMEPAGE="https://github.com/ipython/matplotlib-inline/"
+SRC_URI="
+	https://github.com/ipython/matplotlib-inline/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib-inline/metadata.xml b/dev-python/matplotlib-inline/metadata.xml
new file mode 100644
index 000000000000..6e139ed5c2e6
--- /dev/null
+++ b/dev-python/matplotlib-inline/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ipython/matplotlib-inline</remote-id>
+		<remote-id type="pypi">matplotlib-inline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 387529998d9d..4e73630998d5 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -9,5 +9,5 @@ DIST matplotlib-3.4.0.tar.gz 37142983 BLAKE2B 64b23d5b9e93e6b319674cea06d0ad425d
 DIST matplotlib-3.4.1.tar.gz 37253296 BLAKE2B e1dfd1b0d8bb0d3ed13ac03a5b3112a237c4b7ef3c82694ad6779c810bbd94c165bde88d00fad270d5da6e269d778b33f276620b51e1f134fa2c5b9dcb0a4f28 SHA512 076510ddd152a395fabb76aa47566e9b75f3c8ba3c5246b39229b20fbfc209d4bbdfd441271b22e364f0974963309c02bdd0519fc2a7e8a406afc462f69246b6
 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 6837 BLAKE2B 0ac7dc9aef75e2778102eeead917cff7e7627e1c158a9fcee0d1a247de2d0e5fc7b7b02cff543dbbeba236106f6915906391297bb34598c3ab6e349578caa960 SHA512 31f7cc26d605f3a3db310cf8b5d48a0bcb42e8aff0bf91ea6f94d072c049484be9bb3418aefeb6d02a14e241ff48fc95abf3dad7c87ae5a98d3842c3d0b548f4
+EBUILD matplotlib-3.4.1.ebuild 6834 BLAKE2B 211c75727a0d18cf08b4136740d7ac6a5a6650857ba158a45836575d28b0580a5bf8dd2577a7d580f6d6d45d2f72a52957ad7759f21063b15ff76192c9468701 SHA512 388d8399191903458c0e69cdbaf184184b1173341f307abf9db8c9c83f43770cc297de610d2a56299416224c04c336975b802514ee703d152e471fc1e5e35d3b
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/matplotlib-3.4.1.ebuild b/dev-python/matplotlib/matplotlib-3.4.1.ebuild
index 70fc4ea111bf..21628fe8e650 100644
--- a/dev-python/matplotlib/matplotlib-3.4.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 73046a722f83..1e258e9643d5 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,5 +1,5 @@
-DIST mongoengine-0.22.1.tar.gz 321227 BLAKE2B 933850eb85623a33b1f8e124b6c8375a9e0448c39f5cf44a3aa5b281746933043873d6ac32997121b15c611b9c1a50a1194fa8f364bae3009339d50f5ca98bb8 SHA512 a5188e854aede8feddc01c2d7cbaedd0af4faf5ac03d28f8df9d6dd2f7ae58d9de81eb9d4f3bb02daafb85b7fdf8d54ba38994af07bb338af2b27940cc3413ed
 DIST mongoengine-0.23.0.tar.gz 322731 BLAKE2B 5aa01b59193fa118d9b9c2110d6ec401090bff768b5b2e5d9c5fea4bcb5ae6714c62d4ff664c3ab24c600d912f90287a8ac77313bc8c50e13c6d191baef69e49 SHA512 9dbc45ebf3d367a829947f404a3979236be7ef0fc39611046e2815b6ab83bdb2ada3db8b6d1f4bec6301677f5b727cc2570bb732050e2ff865da49a5ba63d0aa
-EBUILD mongoengine-0.22.1.ebuild 1341 BLAKE2B 78b2206d00d0017a79cfbacb421a571c3f73de060ef58f2590acfbcc354275d438cc78c5a27942a50be57961b73eebbdd40827b4e7d2ca24482e13bcc7d4e3b6 SHA512 b87c16ec9ec4eccc0af139e0437e49fd099714df89e70c9efa0aada20bb07dc01503adbbc25c77911fdc85bbf0fec2fac11c1405dda89a2d5b0dea4438bca59d
-EBUILD mongoengine-0.23.0.ebuild 2099 BLAKE2B 228a306fd1c42d40417617687294db4371b7a9f2ee300a165a582b5e4c6be89026b76c1df1c878637722caf3e0ff6382f4208be9be8ab4a78a20f33c99da869d SHA512 c7d369c4005da4c8a1a49343cb36cbc4785cf407b501925aae473da98290fa81f73b0d9e5ec9c70a991e1834a813649ac05297ec26c71c9cbbec8dee8c7ddd35
+DIST mongoengine-0.23.1.tar.gz 324881 BLAKE2B f6856d432f34c19f9d32aa7fe340c5a09db6976802f5ce320e9722b942f80a1c38a725eab882780104fa379abe212319802f9dd4b405da41454bda84a5d57eb4 SHA512 fcd2ff1df3e2b28bc4cba67cad71a1856e9f94d4d2ecb731a5cce2f1c5e9abc163be37b7db518dfaa54a0ef7f664ac49b621a0554961aa7e13686ff608ef132a
+EBUILD mongoengine-0.23.0.ebuild 2098 BLAKE2B 7364b9ad290bd83dbb1fd2f528679cd2b594aaa4dc158c1856177176341393e7ca2fa624547ab029a27f374033f5751e954672c40db3a2368030a6ea9865f3c2 SHA512 bb828275d6d21750e7637fd4cf4666579602982d2e7ba989f365128085a7ec691ec4340ca9eea10aa3dff1e043169f1bdac5adfb24efbdd677fd2f678be1130a
+EBUILD mongoengine-0.23.1.ebuild 2099 BLAKE2B 228a306fd1c42d40417617687294db4371b7a9f2ee300a165a582b5e4c6be89026b76c1df1c878637722caf3e0ff6382f4208be9be8ab4a78a20f33c99da869d SHA512 c7d369c4005da4c8a1a49343cb36cbc4785cf407b501925aae473da98290fa81f73b0d9e5ec9c70a991e1834a813649ac05297ec26c71c9cbbec8dee8c7ddd35
 MISC metadata.xml 401 BLAKE2B 85d14e37ee9648d1067f85cd133ffc31023c94057b3bba418c3c047ac7ed7234193ab54f1784908ffbbc23b087675d295ad55e59689dc9be312bc3ac966213fe SHA512 8eec6c724d7d943777ffd842f5963fbb72247aa0e9a66a9de006e56421e3b51e262df3aeb04112f2b91c9251ff3e3abfcd1c018a5bf0621a5a7b1f0ba17fcd1a
diff --git a/dev-python/mongoengine/mongoengine-0.23.0.ebuild b/dev-python/mongoengine/mongoengine-0.23.0.ebuild
index f4d6a34f196a..8bc583611f98 100644
--- a/dev-python/mongoengine/mongoengine-0.23.0.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.23.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/mongoengine/mongoengine-0.22.1.ebuild b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
index 6007ec457dcc..f4d6a34f196a 100644
--- a/dev-python/mongoengine/mongoengine-0.22.1.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
@@ -12,15 +12,16 @@ SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
-# TODO: make it run a local database server
-RESTRICT="test"
+KEYWORDS="~amd64"
 
 RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pymongo[${PYTHON_USEDEP}]"
 BDEPEND="
-	test? ( dev-python/mongomock[${PYTHON_USEDEP}] )"
+	test? (
+		dev-db/mongodb
+		dev-python/mongomock[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
 
@@ -42,3 +43,38 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	mkdir -p "${dbpath}" || die
+	ebegin "Trying to start mongod on port ${DB_PORT}"
+
+	LC_ALL=C \
+	mongod --dbpath "${dbpath}" --nojournal \
+		--bind_ip 127.0.0.1 --port 27017 \
+		--unixSocketPrefix "${TMPDIR}" \
+		--logpath "${logpath}" --fork || die
+	sleep 2
+
+	# Now we need to check if the server actually started...
+	if [[ -S "${TMPDIR}"/mongodb-27017.sock ]]; then
+		# yay!
+		eend 0
+	else
+		eend 1
+		eerror "Unable to start mongod for tests. See the server log:"
+		eerror "	${logpath}"
+		die "Unable to start mongod for tests."
+	fi
+
+	local failed
+	nonfatal epytest || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 762fa3780c96..fd8e7960d636 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,5 +1,5 @@
 DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
 DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
 EBUILD mypy-0.812-r1.ebuild 1772 BLAKE2B 15065f178eb5205fc041b3fc49517f42f770ffdaefd688cfa54c7846232bcb2f1292f1a37c4168ca7962578add3b490a739a91f9133e592b7c64fd4c51a93f11 SHA512 608f51989f8ce28ccc3982c6b4206386a9d8fb31f496925a5311f86df871c2dafbcf2fd0b2a353d1b1b87014ce6a532fe9370e9c67320b845c8e5ab88e2c794b
-EBUILD mypy-0.812-r2.ebuild 1778 BLAKE2B 6bd25e103bc55859ca52cd603e8edffeef6f59f84c17af69bcc95e7e6fa10b698ab663ba7d4ce5d1af67f9e3d19e8107b39f73b5872fc07c75157af129a7912a SHA512 9edb88997b9e119eb75721f2f525ab311a81e4810688b883bca3cc45fe9d7889b808aa998423a107ef8899cf7d1eaeec399fefca6eee08a1a1fe0f5194388d0b
+EBUILD mypy-0.812-r2.ebuild 1776 BLAKE2B fac9d47619894b63eaa5af03c7b59d8eecd431dff1dfdf851083098fb54ca32624c77d3dac019ef942099969da8680b4d832241eae2346ade8cabb7ee8b0b1cf SHA512 4058512f892c97959f5ab2d09c98cfd0f1dd5d5b13b605164126c4e0769b97281b9a8a0b1cca297c61be1884034449062952670a664a78a7c7c3fe8beff88156
 MISC metadata.xml 617 BLAKE2B 73f976671466dec8bac8d48582af842bc89261eca6d21410b5d9667a322a231bbfcc6d1bc87ef71fbf32977b5694b2f1f20b5ca6dde3887a045fcf282b274b3b SHA512 3d1b1927b0eae9256340623426b4cb00195d286841fcb7d632987182e985e56c1727d1d30120faed96188714bafd43c9efe211aad444e57c96b33c87457f6526
diff --git a/dev-python/mypy/mypy-0.812-r2.ebuild b/dev-python/mypy/mypy-0.812-r2.ebuild
index d10108a65267..00fcb2f38466 100644
--- a/dev-python/mypy/mypy-0.812-r2.ebuild
+++ b/dev-python/mypy/mypy-0.812-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index fef49521300a..0d5965cb61a1 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,5 +1,7 @@
 DIST nbsphinx-0.8.2.tar.gz 135256 BLAKE2B 9e2f733df713f5285bdcd876d595e5268a193e07c9d3d85e84f315cc1f11250be4e36854c307b96c0e03ab1f64e573896ef387eeea874553f7ca60c51bcba746 SHA512 b474bdbe291c498f8c392c9c5877eac12d9242e4784f2c8621825ed74dc264be60c1bc1b8ae4ff40809c4eb2a65b04ac54e5369eba3c3c79c1ad6b0a4c711bc5
 DIST nbsphinx-0.8.3.tar.gz 135336 BLAKE2B e015c51ccc6ce8ff6a5233f32ca90be696e9c837e7a66b3581b34712afd439679bb301146cd0b8fab083a1f2e48c31930c790b759c8fcc4e2a07a4cd56c732bb SHA512 27b649243970d7a4daadf9283a6cdecfb2b6e9a05ced23c8a487a960af580bb1a6e45d812efaca75b7c09b1e76e3f8a9fc845dee409a84f7767c624765173119
+DIST nbsphinx-0.8.4.tar.gz 142976 BLAKE2B 953c74e5d90a8a304c30334b15409b4d50b3aa4560c7669bcde6526529041b1088cd51ba66573ef3ff9e24843550ed42080c6f6bddc1022d2e1ce59d4e3ad914 SHA512 4e644c02661440f0705a792655c35e1789e2ef051ec24b538e7ddcfb68024063b60a742efc67afbe7578eb3a3b1880a284e8710d08de4c014e46ea34c48dbdf5
 EBUILD nbsphinx-0.8.2.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
 EBUILD nbsphinx-0.8.3.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
+EBUILD nbsphinx-0.8.4.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.4.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.4.ebuild
new file mode 100644
index 000000000000..94b3df799087
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="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/numpy/Manifest b/dev-python/numpy/Manifest
index b0967a0c9e6f..da3557e5929e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,11 +1,8 @@
-AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
 AUX numpy-1.20.1-no-hardcode-blasv2.patch 2582 BLAKE2B 5057f925a12e6703ab5d9d4c342db80f7f5a7f02a5b5884bd9fac574dcadb9234901b08b1b2ca5bc5ba0345a58e896a241e3a48b4b050b2f5a1063324359d84c SHA512 4418b9c5ed3842848bc06a56ebbd7cd9261657e407775374f2f060944522128d8a5178888def6e4cf42ff6d81082d9cc1425d9553c5334ad4e728d0df9b86bc8
 AUX numpy-1.20.2-fix-ccompiler-tests.patch 1616 BLAKE2B 3e2796029854207187322b1061201e7f014472c64d8c66a2dd3f82ec2eed7311f5cc3351d98aeb4b8b75d95608853066a30394e5316bb91e443744f33d66966b SHA512 5ed01b466a0da96b5d7c56b78e420d6c589c48c20053b9da66344384fa93048f90e281d3ed5caa9325f6afe00ff48841b24abc926c75aacb8a6bd5418ed32117
-DIST numpy-1.19.5.zip 7318340 BLAKE2B a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd5666640d08b1ec9919f86cc8e SHA512 dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4
 DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.19.5.ebuild 3719 BLAKE2B 89f1510bf7a43e52f697c67912be79c3bef0a1320eb35e26290c7f7556c630ab8555d029c931966a94598e33eb9f8c3b76a5a59ab1284df3d8386c63c843774f SHA512 3f6ca348191de750bcd92c5a1206d92fcf82333e58081f86eee56c3cb5730a9cdea6678973db3049273b7f3d1d6bf3812e154b218d69c144430a092b0779deff
-EBUILD numpy-1.20.2.ebuild 3741 BLAKE2B ee40697580172840895aa01c24fe0a8aba402bd7ea42b150bd3618b2c1009c6fc1a4c708206d72a8e1376af7463db2dd64b1f38e2ac32067f92d2988837e366b SHA512 c01f8c556083e8f6fd28db418cc3e459d8f418b9d312d56e186071f366fd29dbb941e07742e24eda6cd4407989e8b5eff7e186e6f2b139953e162884b95587c9
+EBUILD numpy-1.20.2.ebuild 3734 BLAKE2B 2a4dd063c94eb074c8ce3f60039710d4426f1f8e0be2be1419af23a791bdee32cb52aaf03084741fdb4d6a849b9e6c4f08aea3d642178361e5d1dd8329ca9f3d SHA512 541e3a324ef2f06236c78b5578a338b0084e1067b2fdd214f95bb579f706e6db91fe00513999deaffd5e7bb4736e49326c8f919e4c1b3b7b8c1dd473364032b9
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
deleted file mode 100644
index 850f70f4551a..000000000000
--- a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index ba2b1f46c..09db18e69 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'flame': flame_info,          # use lapack_opt instead
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
-+    cl = {'flame': flame_info,          # use lapack_opt instead
-           'accelerate': accelerate_info,      # use blas_opt instead
-           'x11': x11_info,
-           'fft_opt': fft_opt_info,
-@@ -796,10 +775,7 @@ class system_info(object):
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
- 
diff --git a/dev-python/numpy/numpy-1.19.5.ebuild b/dev-python/numpy/numpy-1.19.5.ebuild
deleted file mode 100644
index 181526f95b2f..000000000000
--- a/dev-python/numpy/numpy-1.19.5.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://numpy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.20.2.ebuild b/dev-python/numpy/numpy-1.20.2.ebuild
index c87ee1103a27..234a0932bb97 100644
--- a/dev-python/numpy/numpy-1.20.2.ebuild
+++ b/dev-python/numpy/numpy-1.20.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 6ba1b2516965..65d8d1d6cf68 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,11 +1,5 @@
-DIST pandas-1.1.5.tar.gz 5229894 BLAKE2B 5b47774e33c7fccd7a9110e8971e8ce63cafd68273ee870b386aa8562be4c8f667137a4a078eafb2a62847bdd6f73c390254e8024d483c21e1834a8c49d44d32 SHA512 a213690ea658554b78e003a30cc88a59e34195457401d84b1cafdf74433ad27c801c12b8138371bb0206f6dc083ae882eabf0e33cb5733fa313e9f3257d48823
-DIST pandas-1.2.1.tar.gz 5459053 BLAKE2B 49d99e7217d52f1233cdff20628da9028b7a8ce1d89a5ebe502c6e960ca9f7948005e7a63a15b76f9bc44ab5f15e00eef86c3b3179e6cad820e6f5072c7c78f0 SHA512 9bf9212ebdd07785f1877f5f80d6a5beb4637e8a1cf741e32a705a48724280a8e8daae209c66c1a3f00718b566127d77af578d6c72a5d9b68e2b03784c604083
-DIST pandas-1.2.2.tar.gz 5463571 BLAKE2B e27e032bb9d6abb6f40d1a15bc7e9796690f0bd099e5fc7704cbd5b40b37c0f277b462116bd7582263abef8f728d3109f6c4c425cac427f0c750b019fd5e8ad8 SHA512 288ec9f3a2042c2a376340ddc25b4e2d9d3c4de146468316378269d4b70fb271241acb9aa5295415d8bebabad859a9ea9dc95aa71a68f06c2eba73809b9b30e2
 DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
 DIST pandas-1.2.4.tar.gz 5469105 BLAKE2B 7f39e3ca67f5997c0668b0c2e9792869963adcd0347a3983188a992794ad58ccba82105b4dc3315cc17d79104f7fea7a273c218967eb51b1ea1514e87aeebb66 SHA512 79e7a38b8edad52b70eb81ba821141b928c782009d59c50076e7d1e7c015078d333c0c80bda7ba720f4ccb221a0ba93a02885fe6a573567ee37ffae14ee9b2c3
-EBUILD pandas-1.1.5-r1.ebuild 5874 BLAKE2B 01bfc318109bf7234187748e7f2907534bebe6fe032a991c56c479ffbf068199094d8aaad6c10a64d1afe84d2bf66afa052cc056187f01e36e1b52a5d617c898 SHA512 1ef0dc09e253691c9df3207c895c867203180f2617216e6291e909bd8a1bc05155f6c6e830a13b4657a5bb3e976be7a0f11f3e39ad3c5d5e05913ef6a1b00e00
-EBUILD pandas-1.2.1-r1.ebuild 6197 BLAKE2B b79d9a3d6ee85f59d8e1166baaf18d22e7ea48153b64e18b95306007123598ee0efc38b8653ce3e607d911261f4ffcbd3d233d8f0660b158a058e6c58463cd69 SHA512 2f9ecc7c9c3d9092edb3b024eb31d1d31e3c3997e34cce041fd0a9fc09858fa4a2a50616b34a46245af959b8e7c4d11ec7b70c404eca900d217de458ba551476
-EBUILD pandas-1.2.2-r1.ebuild 6198 BLAKE2B 87cc9f91dba3c24462b8bf2e06e67e16ce4808facea7f0eea171a8b54cbbc844563ba644e9b81041282e85e2fea53e1eb885ef57d155d8bd138b747d82245591 SHA512 add13e762742eec440f078c8f7b6ebdc6372f4b0308397b475828983b4f8b0383360ac9f24cf6f9ec7334805e95a01e1c0b5f4246fe3cae07706a9cc29ba787f
-EBUILD pandas-1.2.3-r1.ebuild 6197 BLAKE2B b79d9a3d6ee85f59d8e1166baaf18d22e7ea48153b64e18b95306007123598ee0efc38b8653ce3e607d911261f4ffcbd3d233d8f0660b158a058e6c58463cd69 SHA512 2f9ecc7c9c3d9092edb3b024eb31d1d31e3c3997e34cce041fd0a9fc09858fa4a2a50616b34a46245af959b8e7c4d11ec7b70c404eca900d217de458ba551476
+EBUILD pandas-1.2.3-r1.ebuild 6196 BLAKE2B 3770a8646d55a10945a4845e61c125a1b211415ad73579378cf93835826112620790acf0a146b552c16a35a6f5294440f4ff1c7fa90bb91c131132c75dfea5d2 SHA512 00d90cda83aed40cd09245183fe8bc76b222f8817f0f4c2381ac115e9e68e1147afc6df748bebd8d5ca97574d1445f678c854b976e80aeff5d70d37279c1efff
 EBUILD pandas-1.2.4.ebuild 6198 BLAKE2B 87cc9f91dba3c24462b8bf2e06e67e16ce4808facea7f0eea171a8b54cbbc844563ba644e9b81041282e85e2fea53e1eb885ef57d155d8bd138b747d82245591 SHA512 add13e762742eec440f078c8f7b6ebdc6372f4b0308397b475828983b4f8b0383360ac9f24cf6f9ec7334805e95a01e1c0b5f4246fe3cae07706a9cc29ba787f
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.1.5-r1.ebuild b/dev-python/pandas/pandas-1.1.5-r1.ebuild
deleted file mode 100644
index 75aeaa4bcee4..000000000000
--- a/dev-python/pandas/pandas-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e 's:test_register_entrypoint:_&:' \
-		-i pandas/tests/plotting/test_backend.py || die
-
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x LC_ALL=C.UTF-8
-	pushd  "${BUILD_DIR}"/lib > /dev/null || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		-m "not single" || die "Tests failed with ${EPYTHON}"
-	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
-		-exec rm -r {} + || die
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.2.1-r1.ebuild b/dev-python/pandas/pandas-1.2.1-r1.ebuild
deleted file mode 100644
index e8005c2752e4..000000000000
--- a/dev-python/pandas/pandas-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local deselect=(
-		# test for rounding errors, fails if we have better precision
-		# e.g. on amd64 with FMA or on arm64
-		# https://github.com/pandas-dev/pandas/issues/38921
-		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
-
-		# weird issue, doesn't seem very important
-		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
-	)
-
-	local -x LC_ALL=C.UTF-8
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. pytest pandas -vv --skip-slow --skip-network \
-		${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		-m "not single" || die "Tests failed with ${EPYTHON}"
-	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
-		-exec rm -r {} + || die
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.2.2-r1.ebuild b/dev-python/pandas/pandas-1.2.2-r1.ebuild
deleted file mode 100644
index 5ff9e82c2133..000000000000
--- a/dev-python/pandas/pandas-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local deselect=(
-		# test for rounding errors, fails if we have better precision
-		# e.g. on amd64 with FMA or on arm64
-		# https://github.com/pandas-dev/pandas/issues/38921
-		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
-
-		# weird issue, doesn't seem very important
-		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
-	)
-
-	local -x LC_ALL=C.UTF-8
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. pytest pandas -vv --skip-slow --skip-network \
-		${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		-m "not single" || die "Tests failed with ${EPYTHON}"
-	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
-		-exec rm -r {} + || die
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.2.3-r1.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
index e8005c2752e4..c8f0fca921c0 100644
--- a/dev-python/pandas/pandas-1.2.3-r1.ebuild
+++ b/dev-python/pandas/pandas-1.2.3-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 5fee91a94520..4f4bf75fe7fd 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST phonenumbers-8.12.20.tar.gz 2257751 BLAKE2B a35423ac7c80a8533e360355d4beed5219ded5619b2da3c2dfd6691b9d270353107a6e43f29591ee86f1eb8eaf058b5c5f307b560e33ef9b25c662f02262aac3 SHA512 79fe102b9619564a2b43797440147da8240b901eea30e199b5e4ebb3555a1b95cdbd5153b5938ef6bea9847f71c62b83a0d258b7c8f477f446385b74450305e3
 DIST phonenumbers-8.12.21.tar.gz 2257983 BLAKE2B 2630cc429b49a1d5a2e5cef63b27dd676463627468dc8f3b5bd880573e347c1339cd498e65eaa22566f80e08d4707dba4b1c74f91e37c3caa3e567e8bf577fee SHA512 dfd18ae071d70a5388d9f76941b56b9728cb383dc99fd25efdc3aa7d36b8b60e18fdf1765ee8cf80724c57d165642376eebd131d4738af9bfa11f1af7e4122fa
+DIST phonenumbers-8.12.22.tar.gz 2258000 BLAKE2B 0aaabf98997a254166267e3f37718e6ed745f0ae55b6b338eabc65067d1115a08f035879bbfd6a2ebaa76f4edbd4c50510119d3eeb4502ce2e53e097dc021c5d SHA512 80fcfda8051b6b77f5f75f39341a8b588ec7cc4620433f415f34feac1eaedcd8c36bd43ab75621386282ce1b77b184bd6407a7dff2c0958ce0507dc96383e47d
 EBUILD phonenumbers-8.12.20.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
 EBUILD phonenumbers-8.12.21.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
+EBUILD phonenumbers-8.12.22.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.22.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.22.ebuild
new file mode 100644
index 000000000000..8f5b4d0422ab
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.22.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 0c80768e0f98..9e2f17834030 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,3 @@
 DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722738e1036bfbb533f420881ea638016ac56e9e66ec74a93c6dafc6e4f8807ec3d504400bb675488da00c9c3cb1c SHA512 40e97a54689ca04349d17b69b0e95bb3ef4fde0b60c6c55a2ec76034a5c2a9ebee0b310f68de1636db08786d9b2ad444bf10ac3b42a31404847cc165aa8392ac
-EBUILD pillow-8.2.0.ebuild 2614 BLAKE2B 16ecdb61c8cfa1e2170adbddf68b5c073ef0db36f7da10f82043b6d61f27f5e49d4c569afe4982ae50c4ef6f601d99a93ab747369049e939582fc6bdf004a7af SHA512 0037ea1a32a5f1f1389f655704b69bff4b6db61b8cab49d12ab6e2ee784dc0998e1faec5658f1a56be551ef8f76d7efc3ffc6e6861fc4881c59040cce659f353
+EBUILD pillow-8.2.0.ebuild 2615 BLAKE2B a0555cd384fffc80ad84db7a2e2c9bd0cfa02c0293bf874f97685e4e73642342d2af874c7f53b3446dddda00e313b1e6627c567a902c0922b58c926acb3b97bc SHA512 8b476263ef7ef530a25c052f102670429c37384204e0450d42abc6f39545a9393b2136122199a6d678d2ee4770b70d68b202764382681221b6c2101ae3b88b54
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.2.0.ebuild b/dev-python/pillow/pillow-8.2.0.ebuild
index af4b7299e066..dad2ade882c8 100644
--- a/dev-python/pillow/pillow-8.2.0.ebuild
+++ b/dev-python/pillow/pillow-8.2.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 02f421c15ce2..fbae14b11f50 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -3,10 +3,12 @@ AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc1
 AUX pip-21.0-no-coverage.patch 2082 BLAKE2B ad2efd846eabc81f159cb9c45773258fa3e242ae619428c264bff738456d3957a229807812fd945744163b0d70bea70da36e659d68530c33f810e96d311de9f5 SHA512 4f8e2242897092e41e156b01a35ca2a0c1ddcaa1e4e5347b6fef0f9ae171a8d7283c346c0e0c4b013e62df29eb053095d6d8caf754d162fce89937270f0bf1ae
 AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d5ed4f3fb75e1352eb80f96a49aef51e7d5e72859321f1558b6a6df9bd0000acdf653dd301a839891078e4a26dd16 SHA512 46afc9f5f290e3547bc18f104fae515a06163f622fd43f7b1e49ae47c720e4aa4fd01c97f171cab24305eddd71f5083ba1d3109a67f2f84e46e5320f4ab7f0bf
 DIST pip-21.0.1.tar.gz 8772082 BLAKE2B 2fdd78e2db8ceda2bd21fdeb4d29c0c2eda412827b87cc97ec1996a5b71b9c6e5938c0a6ef696163780bbbc55d81b8b3b1b6e2e79b05fbe9ce4bdd52e3ebdf13 SHA512 2db5397f4ca3a3f56f5add3f827bf1f0a4296019703438d68498266b9d2559b6baa3132061c5ad4c2a08bec6e76a2768763fdca02d86cf32aadd4640afbf3664
+DIST pip-21.1.1.tar.gz 8771867 BLAKE2B 1cb920ab52510e816a7c3b8b6d1b47576a27cf1b208ab8fefa102ff36c09eb4e99b34f213a043550a9e6fb37bb8b6306f9e939371661ff7f23ba03f21b4a643b SHA512 05157ed586597f16948afdad43d98cc095803d2d22b1427ac1028ca2a73a26d65e597446808194343ed36f9eb7cb910ac89e73a6a9a90ee868ec822fdbe641c5
 DIST pip-21.1.tar.gz 8771224 BLAKE2B 2056a741b7f51d56c3984e2b0bcd1fa9cc12ba9677f80505fa5182fc0afad9c7dfe4ecf9429cf5ed5f8534f0a6a003b12455e90537a5dacbe188c8db548b71c3 SHA512 2617ae852cd52db980ab4131d711946b63930d30f480e050555bc61acb78577aa447b88065c6c8eba7e29c7167f78f04b11404cb0c1975caac464fa768ee7de8
 DIST setuptools-51.3.3-py3-none-any.whl 786243 BLAKE2B cc8a98cdfd5cb78a342a3d50049c0ebd0965451e9bd4050b7a133346f505a17842a498531ade9bf932064a6cac81277ecf60d94ef94faa39b78740de87f9fd86 SHA512 1d4f29e392371b7f0e427d0570fddbdd1204f6c98e48a0a289db23b20f7c048551584ac946e30b90d720cce4f508b3c39208e9a70f87067d66734432963d141c
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
 EBUILD pip-21.0.1.ebuild 3770 BLAKE2B 809223baec949e59ee589a954440349091c03b81c4f3d25e405169c0a678aee6e71ea59e1b84a11b6befc27e69d24600f89b17369c0d03e2b5c5f11715354c8b SHA512 b9283e24bccae8a5c8e1ea6a2cd525079d12b85b1e772434726a74d861686a4411c39a5a81201ad28c64e74d997098bb3e52443bedf827268d4d6b2f80dd11f6
+EBUILD pip-21.1.1.ebuild 3868 BLAKE2B ecb6f983248b468ad6d4830954d366a8e09f8b454165ea5e2acb3ffa3ef8b1049cb25d4b8f5e64a752337333eb56934489769c732503a7fca6c42fd5d3186848 SHA512 795ac0c76cfc2a35a6058ab5438ce9280559356e7dbcde6b428d45781ce928cedf19c2f7ae5a7d46305a280d9f45328dfd155ac17c87ad5045e1c2900218b2d3
 EBUILD pip-21.1.ebuild 3868 BLAKE2B ecb6f983248b468ad6d4830954d366a8e09f8b454165ea5e2acb3ffa3ef8b1049cb25d4b8f5e64a752337333eb56934489769c732503a7fca6c42fd5d3186848 SHA512 795ac0c76cfc2a35a6058ab5438ce9280559356e7dbcde6b428d45781ce928cedf19c2f7ae5a7d46305a280d9f45328dfd155ac17c87ad5045e1c2900218b2d3
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-21.1.1.ebuild b/dev-python/pip/pip-21.1.1.ebuild
new file mode 100644
index 000000000000..f6ec7e817918
--- /dev/null
+++ b/dev-python/pip/pip-21.1.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="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-56.0.0-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+
+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}
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/csv23[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		<dev-python/virtualenv-20[${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
+	)
+
+	distutils_install_for_testing --via-root
+
+	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/process-tests/Manifest b/dev-python/process-tests/Manifest
index a2320a3f7486..2becc537acf2 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,5 @@
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
+DIST process-tests-2.1.2.tar.gz 11554 BLAKE2B bf4716f32b8d5e6cd8d5f8eef1156c09545fe22e48134fa0f98c47172141f0365f1995c2dad94c4e3a6f5a151883f92048bcd943fa07faeb7eff9c60f18555df SHA512 56a76d8467312de34413994e663eb63378ff179720b883037735eae9d8f23a5cc0ea32d4a9a2f9041af417b5ada07b7948fd481e3d5b2cb43db3c19183f6b263
 EBUILD process-tests-2.1.1.ebuild 648 BLAKE2B 87ccddd5e816726f6577aadbf6cf52b4673c2dfad8955a989a47f4d4cc411f2739bf03ad76ad541991dac3eb2f69c46d77056218884044770f25d095eac2dfa5 SHA512 1bd58417013f1d5a881a3045a0d17055d2ba8702209653ed3647550118193177b6436883fbf587c6fbcb5bc84d713e3847f01935c7ab020c29a62eaf2abf6a82
+EBUILD process-tests-2.1.2.ebuild 655 BLAKE2B 068466ab9c5c7a3bd40c62e781261019062de56b82cf78cf6c8a0e6074db3228c1597a89bcc9b70227509d4de0de12ef87a1a13196779f9c895d15125944ef84 SHA512 ea1e1f6e00bea85c071d9e2eb3c90adec5c07187fe42ff4185e5bb3741c181dd7c47cea0148f74ffe6fb9c0d13f43f07d9ffcd1aacb5890dca79fa6aace103ed
 MISC metadata.xml 408 BLAKE2B 9b3db07555d5a2939176e7a6628c57510dd02652862027662b225d36c1315d53d3fdcaee98e35cb3b2ea57b759d71a5a63856aab57edd20f9a1cc698c56d9350 SHA512 94e3ab549a93bd8fbb5383300110603d4618da0024bd4b227370e4ffa3af791c632d8fd143ca5599c40fec8c46fe92d85c54968070260f59894ec04afcd776b9
diff --git a/dev-python/process-tests/process-tests-2.1.2.ebuild b/dev-python/process-tests/process-tests-2.1.2.ebuild
new file mode 100644
index 000000000000..9b6ad71f5f40
--- /dev/null
+++ b/dev-python/process-tests/process-tests-2.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for testing processes"
+HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# There are no tests at all, under TODO
+# see https://pypi.org/project/process-tests/2.0.2/
+RESTRICT="test"
+
+DOCS=( README.rst )
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 9070be7c2943..ccf7c7d81321 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -20,6 +20,6 @@ EBUILD protobuf-python-3.15.4.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0
 EBUILD protobuf-python-3.15.5.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
 EBUILD protobuf-python-3.15.6.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
 EBUILD protobuf-python-3.15.7.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.8.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
+EBUILD protobuf-python-3.15.8.ebuild 1623 BLAKE2B a2aa382f4bad1cf89f78843c2513c5237b9137fb63b67cf89baa7996ecc70d55e45e7d8a05d3f61a085adb401ae7d9dd33f82e3a9eba194083d5445cd17106f7 SHA512 4c0fb507b5b421fa5696f5f71b8d28cb6762d6a5607741770dd73abe4249213cc9be13310afbe5fb932b9ec46d644b54db265659b69f8a529ba0217bd2ec2502
 EBUILD protobuf-python-9999.ebuild 1521 BLAKE2B bd43e151f42891d126f9926fbf959fddd3daa8f397a202c47257466815342a7fff16b381292a318ce6b7a34732d65a5c36df99f348103a7fa5e2d507b3693382 SHA512 1976a2b3b9e7445482da42af47d9cfe469409feeb7b330d6f556733f62d70877ab747592b70af3b24a4b1d2593d86a9ecc541b21d0a7a87fe8a8c2c23b326f37
 MISC metadata.xml 553 BLAKE2B 21140c27d2faef17e40528a3a90790083195432bc84b8af3c7f34c836fdacee20acb517cbb1ba15e7c699faae125fd9bc2f40ec5398eff8f01a882a5a02bac3d SHA512 6dcaac2b38128ac9f13de5f4c38e8e10b3e85f73b7777fc12ac15229bb2c94aae6df4e135540d01ae33658df524bf3a6519270c59f1d4f06355f3d786607a13d
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
index c3065bbdad23..aedd8f38fc23 100644
--- a/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index f3d847720fff..338cc3fc13d9 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,3 +1,3 @@
 DIST pycurl-7.43.0.6.tar.gz 222895 BLAKE2B 5a923a3d7a57aa553361206fd0c0e43e6ad66a70af72540c08a29903a9a71ed6b9460c06ab6e50fc2a01d1badd45edf41eb36f6dd97fca3c83bef30f12e41c40 SHA512 5625d9e38159fb785afaf539372a8ac658d9118fb25f581f11629859fde400b6fccf65e03a19e182534a78169531304639b1e6f1bfdd2cb09bce95d581b52850
-EBUILD pycurl-7.43.0.6.ebuild 2927 BLAKE2B e630701fb2796d5321f75cfc48274a350ddf6afcddf6d8afbac905f7dd6eda5171757f1acc40518966a23ed19be68e4f74b0509138b632339253e54a7fcfb3de SHA512 5a220c6d90e7107da417c589a6ab9e992b8c45a3dede6d304070d525be6001b3e6c7be0161156a872cd3c7b2ed31fc6929548e92f076031c3c1457edd760832a
+EBUILD pycurl-7.43.0.6.ebuild 2803 BLAKE2B 29d80d13661e488055efccd9a10877ccd25d8950418e42af2d62a662f181ef0ac8732733376009ccc2bcfd2df05bdfc8998eb07a688acb395caabe98e146785b SHA512 fc25011153e9a1dc7b4683b6969d3da698a693d12f73aa254ba47cec020fe78037386a0d2901f66e2aaf23e347bba5f52bd9ce0c7435b38c9dada1dd2857373a
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.6.ebuild b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
index b732ff16e530..130987a64a06 100644
--- a/dev-python/pycurl/pycurl-7.43.0.6.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
 # Depend on a curl with curl_ssl_* USE flags.
@@ -31,9 +31,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=net-misc/curl-7.25.0-r1:=[ssl=]
 	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
 		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_libressl? ( dev-libs/libressl:= )
 		curl_ssl_openssl? ( dev-libs/openssl:= )
 	)"
 
@@ -44,7 +43,7 @@ DEPEND="${RDEPEND}
 		dev-python/bottle[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
 		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
 	)"
 
@@ -59,7 +58,7 @@ python_prepare_all() {
 
 python_configure_all() {
 	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+	export PYCURL_SSL_LIBRARY=${CURL_SSL}
 }
 
 src_test() {
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index de38ed65e7c7..276b46a0f4ad 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,3 +1,5 @@
 DIST Pygments-2.8.1.tar.gz 4000119 BLAKE2B d88a3a3b4626a33c375b85ec076120e3561d1719ce45f9f85595bf87f7e813416be934f7ea0022fbfbf1a8ba3f2be1c76f693ab9ece5325fe527a4922cf46318 SHA512 223835c78615207ad590d364ba9a0f4bc9b5815baa080e60b9b71ce7b8e1ebfcc7a292d2a2b1cd358c08d820fc89e02c4060876d37ee17fd9e2759c9a0dcc80c
+DIST Pygments-2.9.0.tar.gz 4048049 BLAKE2B 3531aa35d875296694dcfea267c3922c94d73959de82a34329b7582b35c8b76310cfd364bf22066be5251ee61bff996e44d8c8ca82e9e34af879f3f2ba734120 SHA512 60a8b38e9ea941e4f10d1c4a547be81b8545202d11e2162c6aec0f95014a5c2f718adab8780017be7f49e1f220f731d57ec26dadbd543bfd6a8a7d016c01d772
 EBUILD pygments-2.8.1.ebuild 1240 BLAKE2B 15771faf474f253fc1c2911e5043b4a06f2a2c745c055b54af65f066c1324f9688e33c47aa3213d1c5209e9ab41e2982afedafa03d8ad0a3f297870db15eeae2 SHA512 55373c38baa2e28278b03fac78902e6684be3dd02beb049701de992e09c12f33c91c5d64bfde5e1aa84a3a3026c870e4806a725c75b310ccd92485fe1eb3034a
+EBUILD pygments-2.9.0.ebuild 918 BLAKE2B 22e82a5435ce5b11842231bdb2f14dc1bf37405e2e43bbc038c4f66ba439dea36b09ca21562fbfcf3093247a1cc2bbdeefc73df6c7940065e70ab80b3e89b46e SHA512 0cb11a73278a5bbb7a3b8d8274eaf214e8942034303cf32c3d8132da7d3d23c93f025a21dcea25e23d9439fd5b1957cd91158b53d778fa837a6980ccbbb38933
 MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.9.0.ebuild b/dev-python/pygments/pygments-2.9.0.ebuild
new file mode 100644
index 000000000000..bbf823020e28
--- /dev/null
+++ b/dev-python/pygments/pygments-2.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1 bash-completion-r1
+
+MY_P=${P^}
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index defb425b3278..b0f98d3cdc30 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,6 +1,8 @@
 AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 DIST PyJWT-2.0.1.tar.gz 57496 BLAKE2B 1258734d2cd5ca6a4012691bef0ae2a7d6539083241cde7ef27da155cff0808211eddd56b9455e812bae4c739f83fed1c6fd84abcc85208203d86e5834d5952b SHA512 a59b975fb465b44e4d84e3ef0380ed5107438e202e073238700bd700e8871098b9c59a849d157ade7888eef32609078571e2b8af09dca0752d7a18c370c2a0a5
+DIST PyJWT-2.1.0.tar.gz 60092 BLAKE2B 59bde5f73558c74c964136ce0e8e9b5db6b76d226805fdb8aa8f201f00dceed0036693aa9295fa0ebac03c8fdac29a28f2aa79c697155c0ca744d1549e9bb47a SHA512 d701919c6cf06acb45cb0762a4ab7cc5e6ea247fbc0de80d0efdd1fc4b966c0d27c7400869858bbdc457b200586635aeefa8a38b85db818df6a8713f9bda8ab8
 EBUILD pyjwt-1.7.1-r1.ebuild 1370 BLAKE2B 51dea191f279f4758ea5aa6529ac60aa4ece061aa18438c1c6ac0874efe5262a0a979eed1c5ffbcb2df0b866a73032d60e5c2519dfb90d41e5dc8900cdc0b941 SHA512 21007fe2955e747c2185abb48327b21a7a397bc95c289f0acc4951230b5a17b3cbc22784d4bf413e3dbf4054ac1df878e187d383b7a9fea118a9dbc0ada7abca
 EBUILD pyjwt-2.0.1.ebuild 709 BLAKE2B 7dadb2bc6162ab45568e6b9abb55cf6a6225e30a4d8a99245913f2dce734eb347d62b1d6c66a58d9f39a547c4e253af8c070bf72ad78be6a152f531b0c72f903 SHA512 dc1315f8242059ff7c4ab32a785c26e907f824af0717b86d46985eddcb773294cd8cffc4646f39035e60d63dcabb4207e58f6c347fdb3b584cc036be31257d87
+EBUILD pyjwt-2.1.0.ebuild 736 BLAKE2B 492af7ed876a13e5a99183c1ff61671c2ed2b725238dd41f8e73e2a8c0257a2c34d9efae29bf8039851f6fbd336be7eaa0d3ddd6254de144fc84846540fc2032 SHA512 05dad6de9d132e09c76f64d1a8239024e274fd593a7274fe17a4c561c2e958feb4887b5284c6e8ac24718339626fdb0b6e025e9ee5463de3494d1bee50c8f317
 MISC metadata.xml 449 BLAKE2B 72bc65496c7061fe2e9033a92e89fd44efc69ad8055559891279f8ed2fc60fbfa5cfc06c536a6904408f8da6db3537d70337590fc9af3543d35bf9f6d0f482d7 SHA512 1712608360e4eef320fccc8408374c966d9ca611f9170cfbf7043c3782eae002f2d85e56787474c4e7f119b694019495faba3d4e004db18865337db87d290b55
diff --git a/dev-python/pyjwt/pyjwt-2.1.0.ebuild b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
new file mode 100644
index 000000000000..0ef235564940
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="!dev-python/python-jwt"
+DEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 2ce055bd6fc0..fa0c20944425 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,5 @@
 DIST pylast-4.2.0.tar.gz 39761 BLAKE2B 35ab18928b2761255a25e2b8549fe852f28f04057c9fb1075fa223333d079c07340ea17d425695d17c0ec99d67e6e31ed93f6fe60df1121ae7c298cca99b1b03 SHA512 9c8c0eea0d3f54514ba06ad7da0868844f8dc53715717decb3b56772093e637673deb22ee4277e508d7e659b48c79733514c67c9af0283e8aa0032caeae3d44f
+DIST pylast-4.2.1.tar.gz 39787 BLAKE2B 1f2f06671ce38bd42f7297279a58f674c3af8f66de4fe804d90e3fc178c73f09a24f65bbc4fd534da0c04f593dc5eb31f03da38a4ca969ea31a04978a603b7b4 SHA512 c1418ff1e6b6ab905d790cc83eb1a4b3172c0c28d523c2bbd641523a2e2601a84aff126dafd047f0fb9b82744bca883648e197b273026611f47671d39afd4fc6
 EBUILD pylast-4.2.0.ebuild 710 BLAKE2B f8aee8425b2f57dc04d7b7848f5d8f5ea3fdd7b8ad5ee77ff62f36173e1e364f66fd796350594bef99bc04aa80881e217038fe3e9cceba1d288038cd51ba42f4 SHA512 70af9cd05bce1b889dacf7ca839f8079dfe65821421896d27cfd199312fb1c55e733f45379801347347c95939c0998fd8513bfe2af2bf5ec8be895f083611a3d
+EBUILD pylast-4.2.1.ebuild 695 BLAKE2B c6dcdf021a55134b9f4acd7871a86f556afa3937caa438216ec058b032aed31efa7957b9344fdfe7d2c28e48b2e215ea5d410b86c915c9f6ff81f12dbfe211b7 SHA512 a93ba6d7f6225c5d31de2c82453f381913e3960e6a2d2b3d48f6c76bbca4deb74f0eec6d96c7e62351c1a6f62c18798f05ddb184ffdfd4423e007b5a5afeafd1
 MISC metadata.xml 906 BLAKE2B 6bfe370296de02da86dbc7d9b193ba499a3667cd3720014bdea0c37e51b0c945564e9bf5f2b6ef65008dbc58ff7b7799e5464b292ca1d3588898849123fe8ff8 SHA512 15294c8d03e6f8a9571f2610bd8ed831e0c274a124e4533f7375b0a753e95d2277503ab38541c1dedc1e810fd87a2bc154424e39b52135b07f06f788165f8619
diff --git a/dev-python/pylast/pylast-4.2.1.ebuild b/dev-python/pylast/pylast-4.2.1.ebuild
new file mode 100644
index 000000000000..15fc748bcb74
--- /dev/null
+++ b/dev-python/pylast/pylast-4.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 4c4337ce1490..6aa2a4d829e3 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,5 @@
-DIST pymediainfo-5.0.3.tar.gz 445381 BLAKE2B f3ff936100badf6899cd0eb3e1155ac82b2f6831dd9a32baf9c1f67f3f5948e5731798c3630aecd97cd86ecbd5a492e73353c19637775453a1fe291d0a15ce33 SHA512 4124b69910050fb84162140cda5e184cb0fc13b06b85ae61ff6e47b4fca236242558b9c3c8ea90ab804ed9400171f7b1dccc25ec5961b37d1f68de21fe64580e
 DIST pymediainfo-5.0.4.tar.gz 445381 BLAKE2B 37578ba4c748ad7b8fbd435ce8bd4b452812667aec06131b00e27bdc7b50baf10e8d8517e270d1f02eb7c867a278ccf68b3c5f26a588a55c970b79287aabe31d SHA512 0bc231b51e526bf69d10c59085814578c9f5fb542099613ea014484cfb37757413e640332604c01070d5e6bf81564514346400b5a7522864a5755acece2aafa8
-EBUILD pymediainfo-5.0.3.ebuild 798 BLAKE2B 1631cbed40feb919f58bf8b87ddcb328208653d1279e2b83a36400c9fd98fb82912d17761007e645d327711f1e03db3ebf9b96d9229dd91a706c394d980a19aa SHA512 b5aa5a6eaddb40e3ecb53db3c799cd09278767bd659959d3a1edf9413637081a867b9d673699d94babb7d99be4d74b826c25dcbe4bb03187636d287471818af4
-EBUILD pymediainfo-5.0.4.ebuild 858 BLAKE2B b103a6bd571a381cb98e0cf68e45567e8cb6a5cfad259a525dfc6098963f0dd947349294fd69ce9922b61b5b64c97d0363e22fa6beacd59a5eaef654ec66c20a SHA512 08b606add41cdefa1a004ec99df94dfcfa349660f7e5692aeb6fe7325bec4decb7d0027057b64e410ad36fad6f3f9c0b6dcb8eae1f901d4cb9d6d22840af2071
+DIST pymediainfo-5.1.0.tar.gz 445630 BLAKE2B debef8de004232c4e39bd17018c447474a4f71bc386b01710bea8084febb5353cb70512ee77c33ea8b3e6c7b67baded99aecb77b60c52da58be35ef91919f34a SHA512 d3c48e37f6d59b0f5bc1d66d4fad9fea26724863dc2ae75a30c80d972f68f3be650298d25105d330c20b83083f94d2ff5e2690c29573897e09afa44931f3228e
+EBUILD pymediainfo-5.0.4.ebuild 856 BLAKE2B a90415d2e99a09fa3e97a7302b41226b0661e066d3a8c1035139ee12d868c226d887e615a50afd67d92cdfe482719a5b85337e151e3157894616801ae7f15ed5 SHA512 e39a604c6b87f487722615d5b8dafe41d1a141ba4d160db7d99fa51918eea7251ac649024a0ca275b5fe40bbabf003b4b317988b87af636f7fed56ef346889e6
+EBUILD pymediainfo-5.1.0.ebuild 858 BLAKE2B b103a6bd571a381cb98e0cf68e45567e8cb6a5cfad259a525dfc6098963f0dd947349294fd69ce9922b61b5b64c97d0363e22fa6beacd59a5eaef654ec66c20a SHA512 08b606add41cdefa1a004ec99df94dfcfa349660f7e5692aeb6fe7325bec4decb7d0027057b64e410ad36fad6f3f9c0b6dcb8eae1f901d4cb9d6d22840af2071
 MISC metadata.xml 490 BLAKE2B af57dd2a5e345a6f7278614b276fc5ff9e9754286e2e24a651f94f18c238a0be6387319fd10d3b3709bdd22509840b9b02344d4bd3c5d196eb2816d41759890d SHA512 10ecb149acb001a0ba8e0e4af45121672f4a683f5e5690cc2d5fb112cc17b45754cf2a3fe303408fd99c16ea57d799829eca56037a2252ab36fddf730a5fa22a
diff --git a/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild b/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
index 79f47c33505c..706ecf9e9807 100644
--- a/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_7)
diff --git a/dev-python/pymediainfo/pymediainfo-5.0.3.ebuild b/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
index 2a386e30db0f..79f47c33505c 100644
--- a/dev-python/pymediainfo/pymediainfo-5.0.3.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,7 +16,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="media-libs/libmediainfo"
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_7)
+	media-libs/libmediainfo
+"
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/pynput/Manifest b/dev-python/pynput/Manifest
index 0a79925f0d38..547bdae5c6ca 100644
--- a/dev-python/pynput/Manifest
+++ b/dev-python/pynput/Manifest
@@ -1,4 +1,4 @@
 DIST pynput-1.6.8.tar.gz 94483 BLAKE2B c04714fb9cdda9527ed6d3c0e7c25214a7678ee908f1a638023b95c2f63242fa7dc28f193b2055338a9cce10c26399eb4f4af0ec69a6ffaa1be0b7e85481ecc4 SHA512 23cf2e47e0a284aeb2e294529a1f47a01a42bccae146500eee2ff74704cb5ef7ff33327cca5d6ebec338369b1341c489431891d9f034801cc6be9aac2af90442
-EBUILD pynput-1.6.8.ebuild 750 BLAKE2B 6ccfe1942fe6fca77717da9bb6e4ed65f5403ce5335ede35bcf68a6dbf4e85951f07a87277837ee0c2dab7829c685f9f39f27ab8cd6c6ee73bd1eb9210045d2f SHA512 642d5b96bd4cff216bcab2e1ba4a92f444b81d5dab63cdc9e8f35917a5850bb4aaebb1091c69f4fa756b25611a1484d6984e95ab6285f6df231c9aeacfceb384
-EBUILD pynput-9999.ebuild 750 BLAKE2B 6ccfe1942fe6fca77717da9bb6e4ed65f5403ce5335ede35bcf68a6dbf4e85951f07a87277837ee0c2dab7829c685f9f39f27ab8cd6c6ee73bd1eb9210045d2f SHA512 642d5b96bd4cff216bcab2e1ba4a92f444b81d5dab63cdc9e8f35917a5850bb4aaebb1091c69f4fa756b25611a1484d6984e95ab6285f6df231c9aeacfceb384
+EBUILD pynput-1.6.8.ebuild 751 BLAKE2B e3a5e858c195d43fd409c4bb47ed808521f450aa3434717b01b9cdaaa0cb9e0cb671144627ebc0733fa4a57e95a09eae991938d012d34ccc5e0d0f8999fbbc5f SHA512 e30ff662f684e992638e5df506e450f96ad4c88c52451091c9e3171755eb9771777623c1fd804b8d1d70ec2207d36c9c7fe1690139bdc4adb1c585e9cf3b5bf9
+EBUILD pynput-9999.ebuild 751 BLAKE2B e3a5e858c195d43fd409c4bb47ed808521f450aa3434717b01b9cdaaa0cb9e0cb671144627ebc0733fa4a57e95a09eae991938d012d34ccc5e0d0f8999fbbc5f SHA512 e30ff662f684e992638e5df506e450f96ad4c88c52451091c9e3171755eb9771777623c1fd804b8d1d70ec2207d36c9c7fe1690139bdc4adb1c585e9cf3b5bf9
 MISC metadata.xml 316 BLAKE2B 2436cb4bcccc5db69341ebeb751a27a5345f11e3fbce8d0b1ad46f95ece6382ada902c57eb942e6edca48ff8686c4d39c0b1bd0d3578d8526dba00ba30a0ee12 SHA512 72139df9d1f90049feb73789d554f9e487251ee74d8c7087edc7c4d836f1e7b4eefec696399e115420d2902a9216e71bdb69c3d21848e5fc060d41a4c5af40da
diff --git a/dev-python/pynput/pynput-1.6.8.ebuild b/dev-python/pynput/pynput-1.6.8.ebuild
index 081a00967deb..132e0b5bbe49 100644
--- a/dev-python/pynput/pynput-1.6.8.ebuild
+++ b/dev-python/pynput/pynput-1.6.8.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
-src_prepare(){
+src_prepare() {
 	sed -i "s/ + SETUP_PACKAGES,/,/g" setup.py
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/pynput/pynput-9999.ebuild b/dev-python/pynput/pynput-9999.ebuild
index 081a00967deb..132e0b5bbe49 100644
--- a/dev-python/pynput/pynput-9999.ebuild
+++ b/dev-python/pynput/pynput-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
-src_prepare(){
+src_prepare() {
 	sed -i "s/ + SETUP_PACKAGES,/,/g" setup.py
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index dcb33da38972..7d8df66cf17e 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,8 +1,7 @@
-AUX pyopenssl-20.0.0-libressl.patch 1021 BLAKE2B b2158cc4bcde97221d0c18204020f1cb5331a3c38826ebda16bdf8018b038a87bdf1ab4aa81cd2c690b868411663d4a6303eecdeb6743afb60e956512e1dee34 SHA512 aa2ea27211fc06bbca62ff78305d69b9fd9f0cf5d5318f956fd9b386f378b33cf99f7596f35c37343404940d9fe7f9734efcbebadff7a98e5f0f650a71bc84a1
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
 DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
 DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
 EBUILD pyopenssl-19.1.0-r1.ebuild 1394 BLAKE2B 4984732d92add2817d671af037bba4c81ae5310626ef3d6f97906e6bea686a25cfb6f626784e32823e8a1db994a44d51ea5fdcdf78b1f727c35e1234e991d64e SHA512 1abde17a2921dd8a9862abdc25b5b317d712df2e1d8e5401c6873ca0b926c264d81442eb9df8f6ff4f3cacca8cfceb469ebfc1c8a56f0b5f279f8e46b022ef40
-EBUILD pyopenssl-20.0.0-r1.ebuild 1444 BLAKE2B 5a12c135e374a5043f0aed3a7f1b11caeda30266125d8b09c447668fa2d198641b5930a9d61c4723b43dba7be387063afb52c3159dec6a5bed5ce6128923ef5d SHA512 3d6045413a891a758dbb7536094baf5eeffd696a67981aa85994f30bb58a9cd5feafaf84e48ef485ef861af7060d6c1fbe0dfd981f5275598a7a2d979ded5005
-EBUILD pyopenssl-20.0.1.ebuild 1818 BLAKE2B fd5d7ef22919be8608f40afde4c4dd907ce060d929b3f4a961b6c0a386235919b8cb4892bb11fbad6e7953302777bf0525febb2f3c06cfaeb6fd2e76d2663a31 SHA512 832f4cc873f607cc9f13d19de195caaf7fdb86ebb6a124d13c5e81e320b7dedcc2aceeef1f0adb03fe58d726f28661724cf16785da3a7c6ea00a5e6a9b60cf6a
+EBUILD pyopenssl-20.0.0-r1.ebuild 1397 BLAKE2B fe16692349c2f737177524189856d39000d82880f8105f9afcb4d23ee3e2184680596359604f0c641521980f79999152455de7da0b3c7a4fa22ed193d9eb2584 SHA512 3fb1da86880a51c4c1d0fb185caaac45c179f47ddc3e3435a14b610717a5c135320d540c929763e31059bd29629c8e58b1945897a9f4d07c253e983a321f10ae
+EBUILD pyopenssl-20.0.1.ebuild 1817 BLAKE2B fb7497afdd7195befd50e48398b5732a6a229d876c7a2c5cb6dc27f3955bd5d51b6016b6ebfbf0f8cd3f8f64f94b04b5c92ea5b648a2283e77813a9d567171f9 SHA512 411c9474925ba32caa401b460664a2ac119abbb7e7ef646fc0cc36ecda62470a8c8c2b33669cc4fb1467a09d299a748d98c21c8879228bd3df1e1b0f346f8820
 MISC metadata.xml 535 BLAKE2B bf6dde29d0d101534792aab82e884425a32a6d96385e21e46d760902684b32d0560c57eb8be37db82365f5332906540d145f88bcd76626f00a11e12428664ced SHA512 64f374479e80652f5803b3c6ef3fbeb94c3dc23c5805b11390979be02c312c631ad8ddca0056f439f41da7ebf245119c7da1110cad637efb0e4290be9fadd4f3
diff --git a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
deleted file mode 100644
index 6e9c7847fcea..000000000000
--- a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ecbd275386e5608f0f90d3536506d7f50026ffe6 Mon Sep 17 00:00:00 2001
-From: "Nathaniel J. Smith" <njs@pobox.com>
-Date: Thu, 1 Aug 2019 21:23:51 -0700
-Subject: [PATCH] Support openssl <1.1.1
-
-Upstream-Status: Inappropriate
-[https://github.com/pyca/pyopenssl/pull/861/commits/ecbd275386e5608f0f90d3536506d7f50026ffe6
-was accepted in 19.1.0 but later removed since the upstream dropped
-support of OpenSSL <1.1.1]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/OpenSSL/SSL.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
-index 6f785fc4..55211511 100644
---- a/src/OpenSSL/SSL.py
-+++ b/src/OpenSSL/SSL.py
-@@ -140,7 +140,10 @@ class _buffer(object):
- OP_NO_TLSv1 = _lib.SSL_OP_NO_TLSv1
- OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
- OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
--OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
-+try:
-+    OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
-+except AttributeError:
-+    pass
- 
- MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
- 
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
index c74c616363e9..24caf321b365 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
@@ -37,8 +37,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
 
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index 84950bbdcc08..94d6c89412f8 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 571ce4a4a512..7913450337a8 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -3,7 +3,7 @@ DIST pypy2.7-gentoo-patches-7.3.3_p3.tar.xz 12936 BLAKE2B 7d00353f79d535044e4e2c
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
-EBUILD pypy-7.3.3_p2-r1.ebuild 4880 BLAKE2B 652df6a07bc9fb23a636ff2289b9fd4709fece2b26ec5ea029c71e8a394b569b5ac72ff27b98e077c24d0d654c72dd4d74e71c94bfcdf748c52d0b69cf03ddd5 SHA512 e8b81d6ff53b744aab44a46ffea2384a2ebf6a265b32b89d62fce2ea65fd6d53a7c69b8c66e73c600a0c29a1b13b29cb956e428c070d2fc0f5ad97e5c131ee4a
-EBUILD pypy-7.3.3_p3.ebuild 4888 BLAKE2B 6aad063c1cd2ecead01d77ceaf7dae6443093438ad89b08c4a20c3e65510794c4540a5e05b134ac28e7afc4d61cab833310c6e194af28a434c80ba195f7b3623 SHA512 4298ed1f5f2ec8cab3017dbf7aabc8cf49146faf6022134d30e18d3bfd51e4d400c0b4318680fbcbbbea010c29c7617e7dea664983a1706cffd51acd1719f671
-EBUILD pypy-7.3.4.ebuild 4882 BLAKE2B 53bf57f5c0420e7c09b1a443410a4728fe0536c6bf54ac191c707bb3fd038f9b9297b157ff0424aad9589c1055cb9ab5874d3a791468dc493baeb65051df99ec SHA512 d3704ed1211a8742b9147890937eb7801c12389e67de262d6b010dc7ab04db73e2a6e9c5e4beae588bcb9cd83db69c41171b43839c0a5583d69775ac58697979
+EBUILD pypy-7.3.3_p2-r1.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
+EBUILD pypy-7.3.3_p3.ebuild 4827 BLAKE2B 22620214d694cea98b90674aad37ec528e23a589c69deeed66cbc4611a9f3ccac40008182879dbf99176ccca6a4a0f379bcb5064c295827dcd70c29b95669382 SHA512 11b6ba9de991660cde4d3953317861a505985c68cd2b1aca2ff2dd2bcef954e73e646432c9296196364b6e4274788ed66112e115b4e7ddd3bc353c4355f59771
+EBUILD pypy-7.3.4.ebuild 4822 BLAKE2B 2d0ec18b1f09e8eec257a19be038e1e6201265d138f4a2af938b1cedf5793be6c1584a390629a0b134ed3a81572aff8c3b3ae7e814f41f23356da6c2da75958d SHA512 5a1d667aac2b5d0324015b5098c810f97dd9ad87441c1731493467794b14a60e95dc1d19b8ced47c15dd17dbc7b893f56e1a85c7244087e6c528773ab3660651
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild b/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
index 94fa2f5ad800..d6dd6887ee85 100644
--- a/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
+++ b/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
@@ -19,15 +19,14 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
 	|| (
 		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
 		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pypy/pypy-7.3.3_p3.ebuild b/dev-python/pypy/pypy-7.3.3_p3.ebuild
index 98e14cf58366..1d7884fb3329 100644
--- a/dev-python/pypy/pypy-7.3.3_p3.ebuild
+++ b/dev-python/pypy/pypy-7.3.3_p3.ebuild
@@ -18,16 +18,15 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
 	|| (
 		>=dev-python/pypy-exe-7.3.3_p2:${PYPY_PV}[bzip2?,ncurses?]
 		>=dev-python/pypy-exe-bin-7.3.3_p2:${PYPY_PV}
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pypy/pypy-7.3.4.ebuild b/dev-python/pypy/pypy-7.3.4.ebuild
index d9a8bc29d156..e5e583ac6645 100644
--- a/dev-python/pypy/pypy-7.3.4.ebuild
+++ b/dev-python/pypy/pypy-7.3.4.ebuild
@@ -19,15 +19,14 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
 	|| (
 		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
 		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index df1418bfadfa..c4be94d97706 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -5,6 +5,6 @@ DIST pypy3-exe-7.3.3_p37_p2-1.x86.xpak 9153105 BLAKE2B 58a2f4c7e2e6c7cc1c65e129d
 DIST pypy3-exe-7.3.4-1.amd64.xpak 12038379 BLAKE2B 6f51ec285cedef0703a9e145e5ac0ada1d19585be97997a8156a3964949490fd0c874b8c355433d3cd04df4df5c11be7f5badefe2e9c69129052fe51de627a72 SHA512 f1badabde936f5dc5700fda01941be249f4a056f1d61a685bb8c168a5cca6eac4c7e6cd660a5a5d2695307a3b7f4ef1941e5ea63a57816b669d54f497a1a5b91
 DIST pypy3-exe-7.3.4-1.x86.xpak 9159557 BLAKE2B 754fd401084c480a5a2a20c6e9a533fa5f691cbca06b0516d3d44fdf9529541c43f84fccdfdd70422231ddb887a9f5a9e38789b6fc3dce81d9f0fafade587bec SHA512 ff05c3ae252b0a5eeb403a18782707ea8884126763a83bcebe1e60934ad7cd6070db24ebeeffb15397b6c02fc68766011438b2064b484ae6d24991311e2a012a
 EBUILD pypy3-exe-bin-7.3.3_p37_p1.ebuild 1125 BLAKE2B c73b6673f3fba074df41979e3ce6f8f01ed51f3fbd7e95141e3fcb9340a1f434adda98465276d19c235d8dd94aa1422aaac5ef7fb33b4e6853f7c08eef9f48f1 SHA512 b7a4c2074b7b15a91aa546c40c61d24b0c1259ae677260182d6b7eb625c795fc23b9b469b44ee151b45b545431305b53f7379a6fc32f0b93d5fb6571fd741313
-EBUILD pypy3-exe-bin-7.3.3_p37_p2.ebuild 1127 BLAKE2B 08da61e98198eed1b7989bacc748ea7030cab222b3c043bdc5932dc0ce31df2b8d4b9c759c3fb9b724fd274f6438140b52aba553bc136e915c77d21a34d643c6 SHA512 8dfbbbc20aa7ee40fd332db0517be883c72fd3c93bf7c2636848339666a9dad15019423caad338ae99ce81b4290417f7cc4ef7f17717814ebc03edf223b3a003
+EBUILD pypy3-exe-bin-7.3.3_p37_p2.ebuild 1126 BLAKE2B 713957edab7c66f88a258dabd0703b593e8b470dcc37aed77a320be58958cc95184cab50c9b9f40109a750d611e305e829b3b04d60853e7a20b7843b89fddd7e SHA512 3e5c86141bdd7abefb6595e00f738e7f6999426595aeef7173b7ebf460c20e03714221e131878708b8d782ac3e2bb01a64029e5d0ef932a86a9921f0d5b3de33
 EBUILD pypy3-exe-bin-7.3.4.ebuild 1127 BLAKE2B 08da61e98198eed1b7989bacc748ea7030cab222b3c043bdc5932dc0ce31df2b8d4b9c759c3fb9b724fd274f6438140b52aba553bc136e915c77d21a34d643c6 SHA512 8dfbbbc20aa7ee40fd332db0517be883c72fd3c93bf7c2636848339666a9dad15019423caad338ae99ce81b4290417f7cc4ef7f17717814ebc03edf223b3a003
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild
index c25ec9fa093a..c510ad0dd412 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 776bab4c5847..a52f419af748 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -4,6 +4,6 @@ DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
 EBUILD pypy3-exe-7.3.3_p37_p1.ebuild 3875 BLAKE2B aed7bde6ddbefa3a5abeeae05cf4c5fec25f6e83141d998a2b6f95fae214fc4d986f01293ea50dfff07f85cbd39fc28c87b8f45810ac552ad97d2b1d1ae16be9 SHA512 026a3a4b44f4d1916c9e8c520ac4021035bc08aeb98b8bc676bab0a2b04e34656b8a5885930b3ba6dad82d0eff788bee14bc10598d7d8a17e4b398c013efb3bb
-EBUILD pypy3-exe-7.3.3_p37_p2.ebuild 3877 BLAKE2B 8e51c2e911a7ec9aded060d86ef67748a07345dfe179035c52f68ddfc696afbfd40e492830ce92abe92c9de9e0425e6a2e528e23995dba5a7e4942fe8d00119c SHA512 33e4f61c2d68a32ed43a476606df2fb76e431b315963de341d6ebc09352d930b038b54f6d619908d05b6fafe9c58defaa4c0cc3a9a2b229c87139320a0e14563
+EBUILD pypy3-exe-7.3.3_p37_p2.ebuild 3876 BLAKE2B 0aabb30260fc5135310e4336907562ff3176d7d1f053e1ebe648f10058cbb7eaa3ddc04dc0cf1da2b522ccde35a8906f93ec0ba7e4e6cbad0228100cea1cffb9 SHA512 de6acf41c4d817b893a80f6c6ee808687bcdde876ff89dec50162bd45875025eeca46d72dfd8b500b5043b1d87d87c2b6ebd3e0db25c91b18d2337e941c979ea
 EBUILD pypy3-exe-7.3.4.ebuild 3877 BLAKE2B 8e51c2e911a7ec9aded060d86ef67748a07345dfe179035c52f68ddfc696afbfd40e492830ce92abe92c9de9e0425e6a2e528e23995dba5a7e4942fe8d00119c SHA512 33e4f61c2d68a32ed43a476606df2fb76e431b315963de341d6ebc09352d930b038b54f6d619908d05b6fafe9c58defaa4c0cc3a9a2b229c87139320a0e14563
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild
index 27b0473f2566..d73c07c82d82 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 943cf9fd13d2..fb0903c42aa4 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -4,8 +4,8 @@ DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752
 DIST pypy3.7-gentoo-patches-7.3.4_p1.tar.xz 8868 BLAKE2B 5f897f920079dc86d6300ecaf6c9a43c30173b99e90d585151d3efec8718109e9165947ce772f48b6b15ff5c22c3f04f27aec088b34fd2c5c387f0b59728b333 SHA512 aa59f8eaecb1115fe391fe27ecd2c38a6c4213ea6e6de4954bd8a420ce5eb224c225b0ef1df19aef029546b05fa517a4965c9c24d98bc1be46c7eb024415a348
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
-EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5329 BLAKE2B 2b1952617d09a2a7c33055bca8b6f892014acc7af99bb82a43628d7ffebda9f664732e6385311273981d89d38b654ef4554f734790cd75255fa0974bf4206a02 SHA512 90a7798aedcf5985ec53125c7cb34951a5cfa645007e4e0468884c261b5f44eae18abd0bcf4e4f6451a480c238145d211e994e9e9d56775ba7a162327e61d1ae
-EBUILD pypy3-7.3.3_p37_p3.ebuild 5345 BLAKE2B 05dbd3fd79ad226bfe6919dd1babb8e52daaebe3279b8960941934bb8179ac9e1a26c5814a19b490fc02bcf7d465e4f397971adff7275ea787f935868e3b2e75 SHA512 f043566d9e977050943da3b5471d7e99bc62c423185f6a14609680de93e23d65daafab6070356669cebd8eb8a5b054d9f1b2732a4c9c6a0640b1e9d5560de10e
-EBUILD pypy3-7.3.4.ebuild 5331 BLAKE2B f7af3bdaf8625a16ac3a9bdb6d8561be649cc4a695194f1663169b847d533336e272545d3831468b120218a63e5617a388ea75df783834a358aee59d4ff5501f SHA512 a6781e6edbe87d4690aba2b7640b6e64c6dc94155c6aa6ccc899a8ccb3d21b413901d0471cba5ab7744f95b9f791e9e242743f451179dba973bae6fc8e4f0492
-EBUILD pypy3-7.3.4_p1.ebuild 5336 BLAKE2B 8ed205b40412e722d1cbafdbed3518cd284840bed0a73c5179cd4c48f1c6f598118cfba2736adeae63a2a9e2de40dd7167a8f7e85c0dd0025db911f0e6e1d50e SHA512 e87fa34f3f20f3a696a7954892f64975b691644349ca9061314279b692274590fe2114291206b359352fd3ba2e8a5229a4825d8adf76f5a21d8dc99b567f52ca
+EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5269 BLAKE2B 246192170f486fec3156352aadf16c060d10475fd47b75f120774440b684ba6356b7b27e8ce88d8375789ff4070f99290aeda8a428b8edf73a9d5d8d1cd20f07 SHA512 c81c7b4e4810ac4f44f4a5170d3cde9a762f90b9f9f3731fba0cca2f2dd71d9378f765290dd9e2caa974c9cfdc912c99fe338b00e909784c5c74d5cd39f305dc
+EBUILD pypy3-7.3.3_p37_p3.ebuild 5284 BLAKE2B 0594fd6f5608543669d5be7170a192484e2b519b8286edb1971cd3cd127ea5585dfd9e2ebf092659f67aafa255def455edbd4aeda364486ec6d88416654396b7 SHA512 92d9693847103240d8a032ea7fa185ec4e2fca7bceab938a0ee246433281e051e382555698ae7cd1da2f424a1745bd3e33b977c293f1bf532736257e802a1854
+EBUILD pypy3-7.3.4.ebuild 5271 BLAKE2B 7402f9c654b375833a9e29509427948b04ed51e9027bbfff3c8a56e4b87d29874854b8d2798928db8d6b01b6831358b8c0d56ffd9fd0d9210b642b853061758a SHA512 d4331e97b5271681c4c2cb5715ce859d4683fd8f13817dc55477941d6c59352acb19ac8c23df163bb5234854fd4fcf70b579d7944cd915bc0f560f4c22d153cd
+EBUILD pypy3-7.3.4_p1.ebuild 5276 BLAKE2B 8378fb605e382c371d2990c070804b6eb7a4ffc888850b8cdc3fc3889b10fbc2959f9e213997481f9ca43889e015d2d4ca25d512995d1fc8f5e96ddf6ccebb42 SHA512 7852c87f5e8abbbb2cb02aa568d27bdec146418d461b41673b12733144ae20da1d2e05d3cf12c16bbbb2f876c778e2c91f4757263eb24825f7594e1ef7bded75
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
index 5bf04f0ffd9f..6d392c9cbdaf 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="MIT"
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy37-pp73"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
 
@@ -30,8 +30,7 @@ RDEPEND="
 		>=dev-python/pypy3-exe-${PV}:${PV%_p*}[bzip2?,ncurses?]
 		>=dev-python/pypy3-exe-bin-${PV}:${PV%_p*}
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild
index e74561b10000..f3f0a7435433 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild
@@ -20,8 +20,8 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
 
@@ -30,8 +30,7 @@ RDEPEND="
 		>=dev-python/pypy3-exe-7.3.3_p37_p2:${PV%_p*}[bzip2?,ncurses?]
 		>=dev-python/pypy3-exe-bin-7.3.3_p37_p2:${PV%_p*}
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pypy3/pypy3-7.3.4.ebuild b/dev-python/pypy3/pypy3-7.3.4.ebuild
index d148519f71de..7c278dc39c19 100644
--- a/dev-python/pypy3/pypy3-7.3.4.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.4.ebuild
@@ -21,7 +21,7 @@ LICENSE="MIT"
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy37-pp73"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
 
@@ -30,8 +30,7 @@ RDEPEND="
 		>=dev-python/pypy3-exe-${PV}:${PV%_p*}[bzip2?,ncurses?]
 		>=dev-python/pypy3-exe-bin-${PV}:${PV%_p*}
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pypy3/pypy3-7.3.4_p1.ebuild b/dev-python/pypy3/pypy3-7.3.4_p1.ebuild
index 0b16aad31cf4..7e7ed8f9cc20 100644
--- a/dev-python/pypy3/pypy3-7.3.4_p1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.4_p1.ebuild
@@ -21,7 +21,7 @@ LICENSE="MIT"
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy37-pp73"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
 
@@ -30,8 +30,7 @@ RDEPEND="
 		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
 		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 7ed290aac2a0..0fb06a07a345 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-subtests-0.4.0.tar.gz 9673 BLAKE2B 780fbbdc6d4ac88c87002ee14323a0dd1036ab3dadc14b79ef11982459c60635add77e97575521ba0bda61317582e090353b427d945eca7198e294eb3d895240 SHA512 00302f47d1699e053314b6b4eee7c84a04fe0f51f287e338374bbd518c7d245d839ea0f1ccf50d4f35c86138cf6ea36da26e67bf41295205fb38323f2ad89f89
-EBUILD pytest-subtests-0.4.0.ebuild 910 BLAKE2B 6414839a84e6e92ad8053d323d49822afd36e4d2af3fa90346c90d99fd6ea339227bd465acdc54b509d68395337ced82b8851662f182775405f6b73b8d779f3e SHA512 c80105a002597ed3c8bb12aaec9592752c8cedc976c9ea94970867538c0eeabc22c25d4413607e8a5d03a84455a5ad28d7af5b2b74e52c5d36804f19920f06d4
+EBUILD pytest-subtests-0.4.0.ebuild 906 BLAKE2B 7dceb6e8985a28dd0394020eadfeecab910e9971c75abf83b90f820a7ff17e122384232433f6265dca7396ea1c28e8ff7344bf193653a55ad3f0f4b0e98c5319 SHA512 45809117854084378416a410874b68f060cd1fbcfa87c6e02c1f116957d5ca2884d365e8b61a5535029dc08c62419dcf6d8ff2061a3d39e8a91dd733058f0fe5
 MISC metadata.xml 408 BLAKE2B 6aa0bbf41b922dcd85d121ac03cb177f2527c8bf89eebb53bbcf86bb3e551e2023c38a1356f1cb5c55010bf65c97f95ca77d9aa26db8e898ed1bb74133825a6e SHA512 5485b50b9c2f5f23209931bdb2afdea6bf77bd55d2853aea2418691fcd9fd93c47bf4ba3c5769cdfa5240e463b7926a8fe5f0a0795464fa02d46fc61e8dd59a3
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
index 1877e31a42c1..d13fc96e30bf 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 409c74b857d2..8cdeb90a9620 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,7 +1,3 @@
-DIST python-dotenv-0.15.0.tar.gz 30008 BLAKE2B 1a406145f0d0497aa037dc95b80fb04854b2889ba4014e4689a24b142d5d71c49d24ac60406f8b2dc873e661c19e36604ef58eb03c7bc9f890f6d4561be199a6 SHA512 f1f16d2688041259027b12920ac5f47c2d1d96cfc3ec8a362a05ddfb13fee2cf4926c20ad38eda521fcafb6eef8d7895d86dedadef1b1ea2ecd7e33734b07cbe
-DIST python-dotenv-0.16.0.tar.gz 30903 BLAKE2B 10a737d819bbede558ef87e79b64c4347d05e3dc2bcf76877daf2f3a7afe80230dc95bd2667a7ab6adaad3507d3e55d061b1b43f09f1710778683e79c5aef928 SHA512 8025e3c1e3c2eb5276b13716f3f2f002151c699fa9837d61762fb8bc8b5fe9b58498905ff1689bc62c49612b8d81066e80e0a289164451f5b757bdc6bc0c46eb
-DIST python-dotenv-0.17.0.tar.gz 31388 BLAKE2B 1b87a0e1cee4444c6bb929e6f3d859aa032da6105666fd48627987295730e1ffbb233197bdd339996a6ab4259ec313bfa76683c7bbcfc82e39ef02556ff45119 SHA512 77e260c2f39c4f6e7cf030ff2617045a50961d031918e11e1c1711693ab41243de9b14657b3f9e8c76799326af51911da4b034728c5011be7784ebf968f08108
-EBUILD python-dotenv-0.15.0.ebuild 840 BLAKE2B ee90c8e55e253dcf006b65bcb4763e4c1f1e1fbcca15465732660cde676a9008aac026c39850a61bc6a0d6d03cacdb4035bfbe9427ba3178ea61ff6c665fd20d SHA512 8bdaa927abd5844ddcb9848bfbdd73c43b7f88fc10f73d21a3694c8b3143008d77880991305d5e8e7b4c9cd1fa3f4ec69812f77de28bff6ef3ac5ba73cfd1ef6
-EBUILD python-dotenv-0.16.0.ebuild 648 BLAKE2B 30cbe7f35a2b663acb18f6d3e4b0388c6089460c8243c78f57ab2a5706a77ca43c5280e13e566a9cf22fef47a841a784db118ecccddc037926d8a55b349d93c0 SHA512 8c264bd3a7691a596e824b6ec39d312ad2a87328c511e3b349fdbe1cdf478d907e187f2cf3c5a31e88bbc56af4cbd85da65eaa1bd3cc5ba849c72176b0d82d73
-EBUILD python-dotenv-0.17.0.ebuild 648 BLAKE2B 30cbe7f35a2b663acb18f6d3e4b0388c6089460c8243c78f57ab2a5706a77ca43c5280e13e566a9cf22fef47a841a784db118ecccddc037926d8a55b349d93c0 SHA512 8c264bd3a7691a596e824b6ec39d312ad2a87328c511e3b349fdbe1cdf478d907e187f2cf3c5a31e88bbc56af4cbd85da65eaa1bd3cc5ba849c72176b0d82d73
+DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038e91a046a1248dd27af011dc60361f06f5324504d623a6109d783bb3b5ccac7cae758d918b17f5b0c65a1085bda627ea SHA512 42cdca1356ac2ad80884a5bf3ed419d1202d6a54746f7a21dc9c1bc7579383ac5c72e8b708bc33dfea3904228125fe7b3b2190bfe53e8b4767f5223d59050417
+EBUILD python-dotenv-0.17.1.ebuild 646 BLAKE2B 0e4950e71cd59d59eff46c85803b7ffd4efc0d8d699a94382dd4d773d16e79fa75da78ff9c51b00bce4222846f3452177d3df94f0078ae1cfb1d323601116b99 SHA512 009b59c6b98f3feaabbbe652e4ebb0158b718f984d861872f3250c413003a70cc739032deadd4511c5c44ce81aa7f4a20aeb2b6bfa0381463537635e20076bd4
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
deleted file mode 100644
index ff88ef01a115..000000000000
--- a/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="test"
-
-DEPEND="test? (
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Tests call the "dotenv" command which needs to be in PATH
-	# https://bugs.gentoo.org/743784
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-dotenv/python-dotenv-0.16.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.16.0.ebuild
deleted file mode 100644
index 400dad458bc2..000000000000
--- a/dev-python/python-dotenv/python-dotenv-0.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	test? (
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/python-dotenv/python-dotenv-0.17.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
index 400dad458bc2..35d8910bd0d4 100644
--- a/dev-python/python-dotenv/python-dotenv-0.17.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 72b198b030ec..2badc066af14 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,5 +1,7 @@
 DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc6224a2ac1e17ce21230ed684af144c0f72ad99b32674bf19bd716d2cfc3a2f0da6f74facc99acba16e3ebc1873f3f3 SHA512 ad45958d03892d8db75967b150f25509c05ab2a87d5ac4a2ed12fccccfe1f86d7db26c406c6de22ba759b77fe772cc0c00d0e517c71db085618f62094ddadfd2
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
+DIST python-slugify-5.0.0.tar.gz 11730 BLAKE2B 0ec93c230523bcd4ba5f917bc9d2676ae92fc164eccc84198777a59c36ff427fdb7a242bd89f9bc3d24e86b5a1d106f0118cf118349de648f5779c384445abab SHA512 b29c542ec3cb3d05d88be0fb53909b160022fe97dbc89efc0eef5f4e2414031026f570dd6eec1e7bbe2930d801c2fd8d152e49cd2639cddb23392c9b11e7266b
 EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 55ace80e2b6c0f3b22ef75356bdd0d0d885edfa30fbb2022fb0839fe42ec968cd4331a08d081fb81ca39c10b4a506c052893addda6963ba576e3e99eae6092f9 SHA512 0b6479877191bfb5513a86fe807fcd119970f88528a138c5cb0574008cc59e0f9265df5c873061023b1b8ecd1000b95aa338c3a13dbbe6ecbdcf34dfd2119933
 EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
+EBUILD python-slugify-5.0.0.ebuild 552 BLAKE2B fb002d5d30d432489cf4fd4c3531b49109d6afa5875c97b93b1ba5d2151d45b900533aedc51e53735b77805e3e486f8052c51f9213ece8c6047caa023b892936 SHA512 b7afcc6766b69cde0d0f3b617bf135f8b39ea279442c21f47052ddafef290fdcfafac4bde73fe69b6dccbde36105b7e83580e56bd6bae7938395b2feddaaaa31
 MISC metadata.xml 636 BLAKE2B 67238b65f26d08870b390e38a5366992fd40770f843201ebc930689a3e0819d2446e4dcb9b7b128873ff05ad964edc58b478a4134a563669c718fc890337b054 SHA512 144bb0c8a9249471ef29f015d18349c0a142426b28fbcedf21f83fc9b66b5634e3f1a2e7aa53544d57a2045ca3cf4eb3b76f07f8296253517c14f9d6f8906d46
diff --git a/dev-python/python-slugify/python-slugify-5.0.0.ebuild b/dev-python/python-slugify/python-slugify-5.0.0.ebuild
new file mode 100644
index 000000000000..ae681ae6129d
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-5.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
+SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index c8a177571335..b78ea8372f76 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,3 +1,3 @@
 DIST qstylizer-0.1.10.tar.gz 20683 BLAKE2B aa12addac6cbe1ebf043d70189683feda87db3a8c2aa3604a04a969f638647ba32eaf7d156559b8af151136aaca784f26025746d9f3e574ad6eb777801bcf44a SHA512 1a747c2a0d5ce0acd220f528bc54c84c723f50bf39fc8d818f6a5475105319f46700d2f00bc5c0f14de8f0caaee0ab8904a379a3e697ca68d00ef62ec3408b2b
-EBUILD qstylizer-0.1.10.ebuild 1532 BLAKE2B 8c9f1f9cde97d2a71d43229556faf80c541ea8852b2a75edc956aaa67847a2263731e27404744df61a164293dc84ad247fb11b2fb11ab9a210edb3c7c465087c SHA512 95e796722fa48eefcf6f4933621717c10ff15e000079efc014dd40d255518446ce030c326eb3f82fdefdc53457d13804610501f7500f3983278c1bf9fcd40a28
+EBUILD qstylizer-0.1.10.ebuild 1533 BLAKE2B 19a49fb724a3db8d99b89c19c8746f661b96ca424443f11e0b32fa8832298f5b037dd2709aac75f0da11f3a398d76417d8fe1a8ecf314d9bd6bb4dfbd1deeee9 SHA512 a0df706d4da862a15cb23f5d8250464421df6e018dfc8808941f493efe5ade7ccc455e96dc033de44fecae34bb9aff7ea602a1c83936660f97105fe3b278f690
 MISC metadata.xml 501 BLAKE2B 6c537b7cb9a8447f4eff4bd559998b782969b9ecb147594f4f47c4cdd0eae7de2ae3fd195b257b4848f7c08f05cbef68832449684a409c58a6fa0ecd23a3bbec SHA512 e100e912e3ece0c01305b78fca2247e9927c5fe9d3b4d76c89eee5890ded4999894624a183e77714065f6d671a4ccbcf6fcd9fb9dd03a9e44f4125c848c300f2
diff --git a/dev-python/qstylizer/qstylizer-0.1.10.ebuild b/dev-python/qstylizer/qstylizer-0.1.10.ebuild
index d6ea40554171..7c48860646b7 100644
--- a/dev-python/qstylizer/qstylizer-0.1.10.ebuild
+++ b/dev-python/qstylizer/qstylizer-0.1.10.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
 
-python_prepare_all(){
+python_prepare_all() {
 	# Exception: Versioning for this project requires either an sdist tarball, or access to an
 	# upstream git repository. It's also possible that there is a mismatch between the package
 	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index d2d197df40d7..a6d8bc0c6d1c 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,3 +1,5 @@
 DIST qtconsole-5.0.3.tar.gz 428599 BLAKE2B 3110d597fe8692d46ac64c8f058f96356be62b95e74ebba8476eae148a9aa51193da0fe67fecf8a2de90d280121367802866bf17f68c7ad5b52ce3f84914af82 SHA512 efe88c66a508eac4ed14efb698b99d80b1a292e4b90fb04f76be829e95cf12b36e3afd968a6c7203bdd077a8bedbf7207c3a717809aaa3a514dfd99f7d4d5dcb
+DIST qtconsole-5.1.0.tar.gz 428856 BLAKE2B 4176c8add4fb949a82ce33fe9df598d2141c42dfa9ce57ae09ea201398df6ea54e00b890ad2b548b51e95f4dc0c7b2793640ced9b39b7adea910e3d2b90ec900 SHA512 50d2f1466d1fd5ebd33da1778f8271c5a328a61551f665e488c5c45326fabb4b431090d89b39c130a064b3c117cd24dc92e160c68c1eecf6647f2b662b01b2db
 EBUILD qtconsole-5.0.3.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
+EBUILD qtconsole-5.1.0.ebuild 1273 BLAKE2B a3e2959edcfa6efaa7774a8c9099efff7a9a28ec9c581a65bbaab87427906922a5f14fe89a9f2bb16f13954e93924a9d3eae5528f865cd8879bc31365bed6df4 SHA512 9b5da629c938ba2c67a0c7399bc8c4d31504c17eff0dc6704137c4ff0685144569731230e63e5509dcb33b5554bbdad794481a76f4ca0eb7feee82ad712060c5
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-5.1.0.ebuild b/dev-python/qtconsole/qtconsole-5.1.0.ebuild
new file mode 100644
index 000000000000..9fea2d480c04
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by the tests that are removed:
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/quex/Manifest b/dev-python/quex/Manifest
index 1f035b06a0f5..b3cfe608805d 100644
--- a/dev-python/quex/Manifest
+++ b/dev-python/quex/Manifest
@@ -2,5 +2,7 @@ AUX quex-0.71.0-gentoo.patch 533 BLAKE2B 40c189ff1c0cf6dde96351af9aa1d54f98111b2
 AUX quex-0.71.0-py37.patch 604 BLAKE2B 50115d12bca3e4fa448549b799163944e85b01065a95df71c5dace1a5bb6e1671425758c3011dc80530ac3878cec24267a2506d58dbcb7427fcba7100dfad120 SHA512 92bce2ce2b6d9fa7438c8ff97f815db5ad17f422ca43937921f7b585aebf33f66bae2c385bb37f6a31962924786aee3b1e37e87daebf25e741878c81369ed3ef
 AUX quex.sh 28 BLAKE2B c2ae538107a05055fe883c5327c8c4baf2c45568fe34cae8d616a8145d4bc870c111f90aa6c7e88771ed6f20c4d55751625bdbede97b2b306ea025ca11223fd5 SHA512 97fb88ea8894d618ee133aac6edaf6317c247728801bb39f9a7be9ee30b278073290659a27dc72834d2783156fbf4ab6f1cb3c15da178ac0acf4718e6aa476df
 DIST quex-0.71.0.zip 4599847 BLAKE2B 37bb5b0c7ec6540563cd94e0fbc277064b69b0c84dcb3da20a02d1b3fa9d8ee5a801a71be41f908c33ed4fe9271c0cea31ece19be4b489228ae0c962d5731b43 SHA512 9d3b75680b9336dc4903e334dc8e1a389e2acee715ba1c5fba26aca1e905172f52098eb9c6a1c3e8b9354ea1cc857d8802a2bea4ac864fd0acb5d879c2524997
+DIST quex-0.71.2.zip 4466070 BLAKE2B 3c9db64174c9a56a8b07b64b7140e8d65b2352f93f6eb67e2ee34b595db05ffe1b73d0668d668268423d457e15bb365509de9abc0335af7d017496b814ca9cae SHA512 5065495ba568e38f384447cdbd7ef02f8d38cf5cd9425a9ec523e8e72d4ed52f3a02dec945961e568a4d759ab1e45d717cbc55a3b38a9e4dde9eb75524a1eb5b
 EBUILD quex-0.71.0-r1.ebuild 1141 BLAKE2B b16fe74c98a9cdc9ea11cf9e829cc7c127d2b18a0b2ba6f19193906700f65f4be1358a8116f441e15bc3910e53ca420423fcab123b5bedd6cd97c2043aa0a88f SHA512 90c280369cebfe6dc7cb16e2a5e2392ee809867c33a127ed2cbec3e4326b732b5b744247d3f8c1cb0e037a3911e0a88657e7b92ad7eb1edf713f6752e27332f6
+EBUILD quex-0.71.2.ebuild 1120 BLAKE2B 5047c6c1a660d46f2d5126c2158dc42240fb8edacfa726830cd707e52ef7b0eb24b0e444ecded03c8881976d1647baf7ef0b17397252c1f711feac3e6c02c50b SHA512 1265ab8efefd025824b3e04423e2ee5f0306df8c208f1e318611e9cdbb4669b2294150131e8696905a8f8cde2706ccfbc004025b58518097a2d0894b4a9519bc
 MISC metadata.xml 881 BLAKE2B 4413d22f1ac9a42499874eeaac9b3ce75f7475f87bba5ddcc02d2668862ea3b56435bed02312a8eedccfadb96f0c52a27de91fd92485b8e3feecf1ee2501732a SHA512 2aecd9ca466810bfa76da7f5cfd699a92238049e6c1bb47def72431680235fd09d0452603c9b93b32f4c0b88ebfcb6e364d3341a08e220efe4a69c60f5870383
diff --git a/dev-python/quex/quex-0.71.2.ebuild b/dev-python/quex/quex-0.71.2.ebuild
new file mode 100644
index 000000000000..661695ffa620
--- /dev/null
+++ b/dev-python/quex/quex-0.71.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 )
+
+inherit python-single-r1
+
+DESCRIPTION="Mode Oriented Directly Coded Lexical Analyser Generator"
+HOMEPAGE="http://quex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="${RDEPEND}
+	app-arch/unzip"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.71.0-gentoo.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@PYTHON_SITEDIR@:$(python_get_sitedir):g" \
+		quex/DEFINITIONS.py || die
+	mkdir -p engine/codec_db/unicode || die
+	mv quex/engine/codec_db/database engine/codec_db/ || die
+	mv quex/engine/codec_db/unicode/database engine/codec_db/unicode/ || die
+	mv quex/code_base . || die
+}
+
+src_install() {
+	default
+	insinto /usr/share/quex/
+	doins -r engine
+	doins -r code_base
+
+	python_domodule quex
+	python_newscript quex-exe.py quex
+	doman manpage/quex.1
+	dodoc -r demo
+	insinto /etc/profile.d/
+	doins "${FILESDIR}"/quex.sh
+}
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
new file mode 100644
index 000000000000..66363c2dc65d
--- /dev/null
+++ b/dev-python/requests-futures/Manifest
@@ -0,0 +1,3 @@
+DIST requests-futures-1.0.0.tar.gz 10897 BLAKE2B deccf99ffecf3dd04eaaa7692b93b046b027109346555ca9b4172f29600615fb78bd46528c2ae925587d06f24e5b52dc2f02f5d5da04eda18cd97037e1b28440 SHA512 64b39ed99712df8f1be74b2de97500d89711c0d5d3ba0f2b64e3bab755d0bf82029d7ced13b755ce12a2b86f3b673305b651ba6ff4cfb60aed40c8d5876f202c
+EBUILD requests-futures-1.0.0.ebuild 665 BLAKE2B baad3d09d0185bd0ff85cf5a8c4ae616f8e69d34195859194e4fa899725a84cbbd4d3a65c36c7b896ce6b72eb7832550b8e6bb9d5972ab6d2b64e450a311a381 SHA512 5aae91038f680571c0dce9dea1d01c22d20e0d023b925e3e710779d89561e1e2d394362b7331884815f7d5542f376115de9f4f4aa79987d4c1f43c8f803d471b
+MISC metadata.xml 561 BLAKE2B ea0313c156203cf16e910b0609db4b90020169060186c1747a57cc756a184ee1bae67710a10d2391f05aa9f194f1d27635b1b31ed3aeb9ea41162f7da367b024 SHA512 0cc64a107e803d5ea0d0c1baf6ebfeb17e83dd5d682ce334c2065f95232adce74d5fbeaed33461ee9dee55b99b88e208b0d365115e7adb4b8ae709dd4fc8539c
diff --git a/dev-python/requests-futures/metadata.xml b/dev-python/requests-futures/metadata.xml
new file mode 100644
index 000000000000..68af319b43cb
--- /dev/null
+++ b/dev-python/requests-futures/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
+  </maintainer>
+  <longdescription lang="en">
+    Small add-on for the python requests http library. Makes use of python 3.2's
+    concurrent.futures or the backport for prior versions of python.
+  </longdescription>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">requests-futures</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/requests-futures/requests-futures-1.0.0.ebuild b/dev-python/requests-futures/requests-futures-1.0.0.ebuild
new file mode 100644
index 000000000000..b72806bb2c6c
--- /dev/null
+++ b/dev-python/requests-futures/requests-futures-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Asynchronous Python HTTP for Humans"
+HOMEPAGE="https://github.com/ross/requests-futures"
+SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux ~x64-macos"
+RESTRICT="test" # https://github.com/ross/requests-futures/issues/94
+
+RDEPEND=">=dev-python/requests-1.2.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index ef7bbfb4eeff..83f9bb5d0864 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,7 +1,9 @@
 DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e338cec6f3fb718564026d28ea06ac975073f291be9cb685f012c803fdeca1fe29139537529e292b91a3356f0b781f97a SHA512 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918
 DIST requests-mock-1.9.0.tar.gz 66243 BLAKE2B 33602e85376d7812b8f4b35bf657c905ddc7db4d85e3de1f70d38871c90c42fc886e99bce3dc45079b6c8ac8e3e6b0b5291d4acda31d26045396d4ed505c3faf SHA512 1382077357a13dbec65cc4226b628ff6b55348422d9f0e9e2311c85affbc40437d22c2f95fa305303a86decc765a6228366f27eea76e254da194789b1d8fb610
 DIST requests-mock-1.9.1.tar.gz 66782 BLAKE2B 5457d359bf93f3f1e335481e44c1e9a391ee88c648b3c385806274e2c39ae3a69268d792dfc2e4609f2ccebd47dc2a3bb488f11b1b479c010a4194fe5cdc3be6 SHA512 96a8a787daa7d42796baf2807543ca18c27f595e101fd230cd392eb2417b3b0925b977a6fc49d70e21362e5b647cac201cb9f3968301ce2702772ddd85cf7094
+DIST requests-mock-1.9.2.tar.gz 67383 BLAKE2B 70a0772b415f437c38897862d663983d9ac65a5fc37d70b4f8734f8c249457dab6c4b1c04db79f7865a9b31a49aaa9cbbee98453ea5bcda35aad2e7cd9ca3f4a SHA512 b8da389f6642a4dfaac77b2613d12e3028555a5d4154aa7252e50fef527a49fb78d85dbd911ad2fd7d5ebc0efa49a2c0fd8d3b10114596839f0ddb53d917773c
 EBUILD requests-mock-1.8.0.ebuild 1314 BLAKE2B 2905ad624ce6ec7329fb59e02f6309aa0e2781237f3ed98eabd6c89c2e3f8f12fcff366c1974f8ca788124e93e9d907e19845146aed4997faaeb4462cba3661d SHA512 e260ac73f27d04f9017088b557ebf8463f888e1f4b0921856c028399c402281f178372415dfff7207bac342eeb04fd2aa00118dbdc07983c2cc5a83cb8ab227e
 EBUILD requests-mock-1.9.0.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
 EBUILD requests-mock-1.9.1.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
+EBUILD requests-mock-1.9.2.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
 MISC metadata.xml 478 BLAKE2B 73ae7388ccece263501b7b1b4b1953e2528cfa2287460aae4f9d4758dbb9a41ec38d6a00c45f74e87e4625243660ba530f85e37328ade1b88dbda55a20ea739d SHA512 5efc54aa7f3fda2909ddb82975cb6bd554ad90924075a22ecba41e50e4af8a70722ec9f69c7a588ba2cd01cf937d887a11f747bb0787f20976567423feaa5867
diff --git a/dev-python/requests-mock/requests-mock-1.9.2.ebuild b/dev-python/requests-mock/requests-mock-1.9.2.ebuild
new file mode 100644
index 000000000000..930d9082097b
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.9.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	# Disable a test which requires purl (not in the tree)
+	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
+		tests/test_adapter.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index 0bb9c2e087ae..37ca9bada084 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,3 +1,5 @@
+DIST requests_pkcs12-1.10.tar.gz 4284 BLAKE2B 46ebbb00921f356ccf5793fe486d3e0d71b9b1688cb49d1c846c2ef808087bb51b71c18e89539946bf4b0c8d47df5ae7acda342b0e1293bf8a031eba5ba0ace5 SHA512 139d1b1ae740db7667bb079f955610ebbe6327dd6f050d59a0e6603f21a9fe0afde8dcb2ec666bc83f6b4205de05948dacf39bdec2d9f26bf3eaa7d6998f2fbb
 DIST requests_pkcs12-1.7.tar.gz 3914 BLAKE2B f91c7d1677964cfe903b4c0f688e25b5b3b7eb921fdeb4e794cbea24ceafe4e44f7587df48c0ad56ff20114641f6897ab4ef26a64b53e6fcb7d713ecf36bb1c0 SHA512 be3fe00ef405b44d9f160ff35c072b86da511a68380e2737e9316a0d1dd89c3d8ba7adbaaf9865ca01cfbbdb85c477364780cbe3e77e2963dcd7b54519a95356
+EBUILD requests_pkcs12-1.10.ebuild 540 BLAKE2B b74f2f720ce1cda280375b882e4583c130707ad8603d3790ed05b62c8d780ebfb713e6cf53df6f3f3416c570f4ce2e523aa0b50f0b568389a42a5a9a5ca407a2 SHA512 425166d2c5b3aa786c572df8a45ffd8e439490c43f0c976aa8d494477edfaa30b3f6c3f3817a8239adcf838e76bf5847a94fa9eb04fb867669de4fb0cab3e3b4
 EBUILD requests_pkcs12-1.7.ebuild 572 BLAKE2B 72e1aca4d10601cf9c7079c0ee6a98c7f93c010da44a1c1d578be1798678a6008d583ea2871a41ff7f54b7ceea5ed876003a3c15d55d5e4be937684a026e28c0 SHA512 8f018686a9d66f9dcd91f0b8d58157b78a4b9c933d8501f1ee16e4fcd08d8a325e6610e0419604affa78a78208fd4288ae58e12a2d85512de0b4e4bb5edfd882
-MISC metadata.xml 555 BLAKE2B d70dda6dc42c1a4da489771576e149a106fd0dae72477045e98a57c2fcd04552057d526b52da2c1b1ced97a118a6c0d914100ebe0e2996a12cfc55c9f66da128 SHA512 3ae1a29b15280f429202f4b031ffde905a26056964ba53610ae29f961d3f7c2562b8a5d27d701b3c1a72204464cf5c4ede628339ce3e6874aed62f127523f32b
+MISC metadata.xml 656 BLAKE2B 2d2d3196e57963144bdbac769eec67de1f28312c7c4b1d1b301435af2452a4d86118ef43b42c0205decc3c59e36bb56f6128b2c906daee9dae4faf08e05878be SHA512 da62e72e285bd305d2d7d0f0be56dcc98ee844a735d0d0495ed42d75340505559a4b4f33bcd1827418328dfcf42629aad32b361c87374ad1e13496c2151c0999
diff --git a/dev-python/requests_pkcs12/metadata.xml b/dev-python/requests_pkcs12/metadata.xml
index 0a878536db01..e0df1fd7383b 100644
--- a/dev-python/requests_pkcs12/metadata.xml
+++ b/dev-python/requests_pkcs12/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Adds PKCS#12 support to the Python requests library in a clean way, without monkey patching or temporary files.
 	</longdescription>
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.10.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.10.ebuild
new file mode 100644
index 000000000000..d5fd9b39c41e
--- /dev/null
+++ b/dev-python/requests_pkcs12/requests_pkcs12-1.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
+HOMEPAGE="https://github.com/m-click/requests_pkcs12"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=""
+
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test" # no tests
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 9dc5114f2adb..64d1360383f8 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
-DIST rq-1.7.0.tar.gz 579373 BLAKE2B 835868a294478af07b9fa97fef14b0f2013abe125263efa15c4988eeaf564ee61ab2e8d68842c730a0f8b02a19a4d66f328828fb939a05b9d3b36996688192e0 SHA512 4027a8e1474cc350cf539ecf5734c2f851ef4e61bf0e106e44f359736f4f1ec4e690af97a119d12b1b7614b38ec4da286acff98b718ef604b5c367b3cc2af741
 DIST rq-1.8.0.tar.gz 584251 BLAKE2B 3da1d4f1604a57e16e26c39643337fb8ab804089f783d6a7c44500f577a326cf4883835c996427e819896faad512b9a380ebfdcf67e865eec475d39321ecd2f5 SHA512 e8946b4454e67bc9ce0c69c302ba3bb6403654cce384904d64996766227ba8fdcbff834a8901a8fa09dcccebe8aba769d38daf228283f4142166fa5ea0f9a107
-EBUILD rq-1.7.0.ebuild 1682 BLAKE2B e9bb9e262cbfbfdb68f00a51e9a01e840f39fd6afc550327a8288c90ae7388290032c37d36d9891694194aceb211a952a0dee29ba48b69c91fe10867472e5f4d SHA512 6581103b3843b2229a2011c9a4646bed9b811d49a88f79f4c60452655cebb09922544488d064e5340e9389e50e01364e17c393dd141ad865a7e27651cf4cb1f1
-EBUILD rq-1.8.0.ebuild 1403 BLAKE2B c72b592e65f7ec571790dd631fb72281d19659b4c38830562a44b366f66470335ee69635cf79ac958e878f232681731f7428d1388c6bbae2f2bb1f75bbc06518 SHA512 005577eaf5021c24404f66fbe25d9fb769287e225367166e996261884abdd0bd7bd3f50e71ae8444ab59030096183b68dd6d301f1389bd95b818cd3a5e59069d
+EBUILD rq-1.8.0.ebuild 1399 BLAKE2B 50a75ba7eb585a6fb8f1e9b6b39b6e855457338fb764fc2a42b25419cd54f61522f353b245355ffafaa026e9bc6acdf4a17e92ed96426c5b58b7bc3e29e49d82 SHA512 7a098a65b9ccd37d1f6110a0eb06efa100885065a94c3b198b5e1fb10c33f71d9cf089fbf2c0b30fee9d9f1977b03d23cb1c207e05b4df5403a1579f8fc4c263
 MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/rq-1.7.0.ebuild b/dev-python/rq/rq-1.7.0.ebuild
deleted file mode 100644
index c7b91b7e21c2..000000000000
--- a/dev-python/rq/rq-1.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
-	# Tests needing rqworker:
-	# TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
-	distutils_install_for_testing
-	PATH="${BUILD_DIR}/test/scripts:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/rq/rq-1.8.0.ebuild b/dev-python/rq/rq-1.8.0.ebuild
index a4636c36d1ac..36389c00f7e1 100644
--- a/dev-python/rq/rq-1.8.0.ebuild
+++ b/dev-python/rq/rq-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index e73748c7d6f6..80d19ab9e3c8 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
 DIST scrypt-0.8.18.tar.gz 56651 BLAKE2B d0e71e0677ab5f159da829eaf8e794fab9fa9290ff3688e525c4f2e9c60fda532d1c302fe4088bd8e88e06e926ef95d06bad145697e8a13e2662eda7027479b7 SHA512 b033203f65dd63c1e915eeff6232c01f806eb01d3ce18e753b6161ae667555095fe775585dd0d4e15ae228f2d4862860093c1a18d5b810b438d032df9fb24d81
-EBUILD scrypt-0.8.16.ebuild 616 BLAKE2B 2e39cf9b8cccf507aaf8e0ceb79525159b941ffde9392f8a7ddbea8e1359a60dd614ef986aac3534d22818cbe4788dfea2845b2962e03051d3de548c4e6f9016 SHA512 f353ace88573692990a64595e11b4a416b17fac4a9b4e98d9c89593daa952259c463acf355d1bf72735c95bf12f34b887825841f8b18c353580a2cdf9ea49319
-EBUILD scrypt-0.8.18.ebuild 602 BLAKE2B 26e8a94ec56c9ff94053c53cc579f2f3c06fb29b0308c0a7f816912f1e5eb24393528defb7ca1bfd00dfa1dd909b52d32cadd4277a162c066e4f015ec9b73c5f SHA512 3d3c48cbe434e6714b3039130baccb123eeb38fbd9fb9207d923f05dfeab693afebbcaafa49f733a4a8aeeba0d825c8b697bb34b7e99ceb8c50cbd52d1615e2e
+EBUILD scrypt-0.8.16.ebuild 546 BLAKE2B 9bc00a9fda98f57d34b102e22aa94a13583c6f05c7d53a93503f88efde926851e7a2569cb34920d7cac75a91bb3989e467e99e9d00c48d73df287ec357c3550d SHA512 ce1200f2950f07d7c163b4e2017969b0d6dbf2459b5603d7fc04501529bb87298d81e8cb8cb0d503f14306d25348f1f6c1f2c6aece6a5e146103bad04be3b8d6
+EBUILD scrypt-0.8.18.ebuild 532 BLAKE2B b842ce88330d5bb7873e18284093628e245fe5d2b903c6594acff4cfd34e5ce99847eee7d37a36513f05a758440845b57f3d18f7ed59156c7da8250ea1390c94 SHA512 b8b3f758169ba6b2e03bafd6733d609a609e33c9592fe70a7917a338b27f2e0dfe66ddd3cc294a2f4becc4a8547355f76d13d8a00cfa57486fcf45496ce88023
 MISC metadata.xml 476 BLAKE2B 3b898ca601f0aeb1e05247bfadb54156de56a5c425d1bda5c25cd0b3f05c51fbf1e14137022a954b74f0d141f494707db2e437beb0c742bb1bc4428a48e2a555 SHA512 821250cfea1c6d91a6165173d268a7aa8a61f19678c02d5df665ca568793681a1387b68e0d661c9f7b3b384c386a0b2b20a9b86ac8d1eedf1a06f06d9d2db65b
diff --git a/dev-python/scrypt/scrypt-0.8.16.ebuild b/dev-python/scrypt/scrypt-0.8.16.ebuild
index 9de6aa2a8c18..42f2c3ca37df 100644
--- a/dev-python/scrypt/scrypt-0.8.16.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.16.ebuild
@@ -14,12 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
-IUSE="libressl"
 
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
+RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 
 distutils_enable_tests unittest
diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild
index 57fbe197e0e7..0cd1c015be55 100644
--- a/dev-python/scrypt/scrypt-0.8.18.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.18.ebuild
@@ -15,12 +15,8 @@ LICENSE="BSD-2"
 # no functional changes since 0.8.16, so no point in upgrading
 KEYWORDS=""
 SLOT="0"
-IUSE="libressl"
 
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
+RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 
 distutils_enable_tests unittest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 6f0530d328ea..5c06fba7f835 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,11 +1,7 @@
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
-DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379
-DIST setuptools-54.1.2.tar.gz 2053508 BLAKE2B 23958ab6bc8ac5681fb4a86217b893f5389be1afc9e71f77a3aaaca469e3f86117e55f9df8f864ae56059ef6aef054a6a5ce8d6670a5ce266de6322b820e68d7 SHA512 b6efe6e92227704a95d4d4a31d033df6df96a430d7e51cb7df80203af56d8f8f64c95deaf194c7cfbfd2111f5bc02be45db2c0383c3209c898c1858821eb4642
 DIST setuptools-54.2.0.tar.gz 2054279 BLAKE2B 2a52e76808fb2bc6df4c59ac7476a9386401180ff6c0d52a5f3d87aedf976a3057cfa0a7ddf2a4497c4c1552d5ebe4810c4bbfa127e1293f950054bddbf7d835 SHA512 b18cd075cf59b8648611eef1874de41199ede6ffe6d7f5047586c6ac8783fe18b9a4f537783e590e7aec127033f612b93925e92f039bd6416a609fcfb262e354
 DIST setuptools-56.0.0.tar.gz 2054762 BLAKE2B 3fc0f47304109f765ff0f8430dae735005d508aaa79609c5ca08217eb3802014267bd0f1a4f4678b417143f0d22b4b27f166573e41685229e0d4491b1789713d SHA512 951d43a0192b9dddacd7bd7ff6b76e281c14071771096db3c413fde6ea67b0c534f17a770cb3464cd3a6a4e8145b82f4cf5c0228e76e6f2cefe88d33748816e9
 EBUILD setuptools-53.1.0.ebuild 2126 BLAKE2B ef2d14c8674ce19ca5c5ca8ddd1c2a85737ba65692d2f5f2f1a83f940580d21407bcb312e34e4f2903596b35a741b246a934be0c60d6624f9888807e9cff411f SHA512 7852690b68bc1c0a3bd0ccf31183b03a24fb701a7ddb664e9eba4bd9f8ae5a0e7707ccc938b80495dd7a42777c30cbe871ba8135ac2f69f78e32dfe1f9c18c4a
-EBUILD setuptools-54.1.1.ebuild 2227 BLAKE2B 5fac1e377bb173c80ca9e2e8a33688e4aab22434e23d8e61f7fb564a006a155b98d193bede2568ea80a72093a145a033c09be843dac16337f5fa55f3223ecd8f SHA512 f73a69d5a1ba2ea90bb55dc87d82e1eaa4bbb098c1b49cdc0572368089b7db09eb2599552620ef651b680483f6d4ea73ed0a63d2b308a888cbd1922956a163c1
-EBUILD setuptools-54.1.2.ebuild 2234 BLAKE2B 77b2c6a1dd0c95dbfc33a4920fe199834c76cd2e1985fd646d0249cbbae00b2086b412295addd28339e2400c90a9e72593b7e2913420bf961f310c040ad23cd6 SHA512 919f767e1d0ae2fe5c805e1414d2908fbf479b0a628e579f8688d4e9697c529972f86f675cc42399ae20151b19edf07106e1d7f9d6d64be02cc9536c6785d705
-EBUILD setuptools-54.2.0.ebuild 2239 BLAKE2B 47c9b17ee82bd8383f2b2833e4c5abc3c99b47c6ab129d4e9472da195dbc63f126e041608bd666df25848ea7b873c8708fc8e7fd227d9cb9721b4db2ad62fc1f SHA512 4875a32f23efb0ab34764c74f0b08d16dea1e72cea8581b93aa91b7c012e55a6326371fe8172991d05898d7c2f248cee9650bf02ed2625e72eb9aedef715776d
+EBUILD setuptools-54.2.0.ebuild 2234 BLAKE2B e9be044cf2882dea07a492272603aca716dc34c6220b302f12b71e434981c22ccdffb8b12a70710d40d56d81fcb280ea8df27aa0f5a7ae9866d9688929355764 SHA512 d1e99281df4184ced7f1d49e9cbbaca1c148ba8aa4b6602ca992dc49583fca67a056e7b8b1264c7ec88d3e93f355b87ce9bc6e1fbc168374553176a91e577797
 EBUILD setuptools-56.0.0.ebuild 2241 BLAKE2B 8e58e2acc3cc8d6d2b3b8fe16ee3915e5bbabbdc08f4ba23c73af7455ee18c6ad1e462191a95b48d3652554969fd21bd960ab23a4ef7e0398d7c6cfd2ca1f055 SHA512 11a118d499b3b36e503c448022cfb7e67a36b727015d060fcbfd300eb526336ee8fc13cf63150425dbd26f88b4c60bcebb3b326f7723cb3c4d09c0db94fdf06a
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-54.1.1.ebuild b/dev-python/setuptools/setuptools-54.1.1.ebuild
deleted file mode 100644
index ca447b23d5f0..000000000000
--- a/dev-python/setuptools/setuptools-54.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# network
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_distutils_adoption.py
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-54.1.2.ebuild b/dev-python/setuptools/setuptools-54.1.2.ebuild
deleted file mode 100644
index 67fc34e2ea88..000000000000
--- a/dev-python/setuptools/setuptools-54.1.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# network
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_distutils_adoption.py
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-54.2.0.ebuild b/dev-python/setuptools/setuptools-54.2.0.ebuild
index 752ff3c95f7e..75f073153dbb 100644
--- a/dev-python/setuptools/setuptools-54.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-54.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 725781bf7571..5f899f35c28e 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,4 +1,6 @@
 DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7 SHA512 1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc
+DIST slixmpp-1.7.1.tar.gz 931753 BLAKE2B 3de14be36353bc5f5f2cfbe002c44c5e843a7b36fa31a9dd315e363fc67e36d080df0dc70d82e65c6802c41377c2e98f56ff4e23cc5e9a92165c3d3b7565493f SHA512 5a59fcbb901e6f4456049f1ec2bbf781b1ec7c5a3ad4b66216d4c5daffa7f0606f74b941647fe2b53e6c8cdc476371305c7b7a2ca24d21450e19548f888be3b1
 EBUILD slixmpp-1.7.0.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
+EBUILD slixmpp-1.7.1.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
 EBUILD slixmpp-9999.ebuild 759 BLAKE2B 73307904570350f10e384b16d54944f2ad1d0c0ec07726367a3bcae3b9f37b2d790dcb65bb7ac4600185791fd8c656ab7525b6826ecd67b48131f05a1ce7b96f SHA512 4052ceccc8b8ac8c71d171f7c2238dc504e5cb7855a08af76fdc8f37aab792a6ed1cad4694f673d551eb69caf3c69851605b906b1ea1200f52f87da34310f579
 MISC metadata.xml 422 BLAKE2B db362b9a364d657718bf47cb72e77a4b63cc20e1db7586ed594522b2c0d4469532514fc8134006f8d641d1b995c7a6eb0ab6295dfa91a44ab25a1d14eef47044 SHA512 812173f68fc551369c4b504098d3b95b826ed382d03a6b21791b9c5cc93d61c4332bdded97c013f71d9ea6d26362e0572d108d1790d10b193dd415e595a4d47e
diff --git a/dev-python/slixmpp/slixmpp-1.7.1.ebuild b/dev-python/slixmpp/slixmpp-1.7.1.ebuild
new file mode 100644
index 000000000000..0f5e88aa5f6c
--- /dev/null
+++ b/dev-python/slixmpp/slixmpp-1.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 library for XMPP"
+HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	net-dns/libidn
+"
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index ba5b9de878d1..33eba15fd8e1 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -5,6 +5,6 @@ DIST snakeoil-0.9.6.tar.gz 261998 BLAKE2B 1f81e633321b7b1988865092ec2778feb35338
 EBUILD snakeoil-0.9.2-r1.ebuild 755 BLAKE2B d721e65479ecec1750a47d35e682d68452c0582a746ae0989698c22c2b9608c6197c457a0b68db3f1f7f6cb6820a0b09f6b22f53509be99ae809a526fb5f2bd5 SHA512 f16351b364239138db61dbd850ebf74014b3e63fa8c6d0b9f3b6c121a743fb9b54bf3b909a614255b1d11c1d2f5d1a965f86364547ff11178ec8df35c4c36771
 EBUILD snakeoil-0.9.4.ebuild 753 BLAKE2B daac420726043bcd5c0c742aba5384325c5206c5b9068fdfad02bed5e625f67ef388d8e5a19a8e83625c8b520370f87966fa26285f01d1236752510b6bc8f36a SHA512 f5abe777e2ef85f45681ca1c2acbbe774b50b036d8b0717076d987f5e5c640dc3f55ac22796327509b4c106757b8db1e249929a2cead7f6fe5f545e59096fe08
 EBUILD snakeoil-0.9.5.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
-EBUILD snakeoil-0.9.6.ebuild 805 BLAKE2B 3af00e14e34e81086e214cea2bb68e5b71d40a637f16ec0aec0454af044b7eb2ce3eaa59a9d300ef8734ebcd3ec0d8e6f210d35f3b38effc952ad211282cace2 SHA512 3abf4fe94963a53fee296d04cea8f82be1470b5480b0e0357128ee5158f821082594b9b562c3f386accacef034601f701524edaa438cda1adfc3f747b772543c
+EBUILD snakeoil-0.9.6.ebuild 804 BLAKE2B a1770eb0fccf067628da9c9f8a8e68ba742707048c1103774963616b0f52ddda915a7b7b36ac02e1fbf024287d56975ea49e13c1dff9af26b515bcc2b3e68788 SHA512 d588ed9fbeb5c925c07534fd46095f61731836d6b02e3e7e38d59693e2bba64c82f4878035514064d2e2d1746676358d951a2dfe91a99149a227ad9d7376a200
 EBUILD snakeoil-9999.ebuild 805 BLAKE2B e8cbdb8ed6a3d3b4579f6269f102d3912f80471465c4c09432c78e2bf856e17c763f81dcf649838856dd1fb897060dd275d4e0e51a3b1b1279acd5faee2df227 SHA512 36a85422cab84849da2d8a3d0c3104bc0e7e3a46322ac4112dc08ddf90c1c91be2602af227690d2b2af83d438a65cbbe6bf3134ebb855d9c28572d421dda9e9b
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.6.ebuild b/dev-python/snakeoil/snakeoil-0.9.6.ebuild
index 933aba9da107..d479c2dc1b49 100644
--- a/dev-python/snakeoil/snakeoil-0.9.6.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index e11d421dd97c..4810da0de71f 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-spelling-7.1.0.tar.gz 49353 BLAKE2B 59e1f5e3fadeb175fb3d1b7a77acdb23e532456de053f886507c76189bf5f657a948d6288625110ccacfb5b673f23d209e6164f3535da30559f0ac4e792f34e9 SHA512 b8ae9ad79afacd362a986dc63d3be87b91d3560333bbcb026ab7d64fa8139e05e048d5e868df0fc40a159a3c44aeac01191df5ef8208bbcd7e35242f9a0b97be
+DIST sphinxcontrib-spelling-7.2.1.tar.gz 49584 BLAKE2B 7211acfe344b157c0d44f356aef4c31fabcb1b30256cec1693fa67d2652d80c8f3657441c193f82ef26e0e7acd7d141732bef0704462a292355d70a18ab3c2be SHA512 e9b9709b627545e1191d64753c97c0cf65e100d5379e7cc1da46faf9c5d5ea0eeb6c7aafe99331f9518488fb0801c245e0c1fa9853360bb6cf373515a4fed2ed
 EBUILD sphinxcontrib-spelling-7.1.0.ebuild 1294 BLAKE2B 5263b8983129d0c294052eba258e2a377fb447bab21547e75480aef2e595e85366b5bad1955bfdc8705797caf7c8592cde2dc80fdfeae5e7ae793b4758aa26ad SHA512 7ba4902205d9c745dc61141cabfffbd48cadc9e18ebf92bff0461a80eaae1785d2d7c50a6edae059a88fff3dc43366dbeae1640306df74e1a19c37fa2b8ea245
+EBUILD sphinxcontrib-spelling-7.2.1.ebuild 1256 BLAKE2B 50dc85cef7ab7aac2b2988c64cb57305e9209e700c673b6738d94a7940312406e69d6d82dc4f6b92aed0dd9f25748686efd667a5a4c59a376e90607938f69770 SHA512 ce7172e0eb17a889d5b66c25dffbf7741bbb688cf1cfd48ad9160c64d7b3ee447fffc7ec9ead8e804f59520d1620255da4600981baf186661edc020ab80568cf
 MISC metadata.xml 450 BLAKE2B a64fc81ee1b159f6ad2d8fe754cfbb8be207a77d128d01cb7cc0d46b6ba4deea1e49e49654a6b0759699d4dbddcede66cb38457c0b476e4120eb3bd5d34cd37b SHA512 0decb41e64275e11d327f2025732865ac4469b7dffe45386b100f6813df5554e71097bd957f57331856d64c9c8c89ad371abfbb25e0db54f3bf7efe2c85ad1ec
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
new file mode 100644
index 000000000000..28d6e037b439
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://github.com/sphinx-contrib/spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+# The doc can only be built from a git repository
+distutils_enable_tests pytest
+
+# We don't want distutils_enable_tests to add the namespace
+# package to BDEPEND under "test?". Therefore we add it to RDEPEND
+# after running distutils_enable_tests.
+RDEPEND+="
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	local deselect=(
+		tests/test_filter.py::test_contributors
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index ac67d16162f9..2ae599f74ad5 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,10 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
 DIST SQLAlchemy-1.4.11.tar.gz 7551299 BLAKE2B 65f560223f1f1656ec90a2b46b5447e92908cb7a8124f1a16f59ae04e5c22b9c4b7a30cbc0d1c8ebf31d31f544619223bdff0546fcfe6124195c4430bc8167c5 SHA512 28d5da109d754183e7f1887c652c47cd7162afec285a44ed6bc51566dc40d43cdb8cd1794f93f31b2e085488025f04243613d500936c220aaab3aedb75fb6dcd
+DIST SQLAlchemy-1.4.12.tar.gz 7583069 BLAKE2B a3097c53ba1c8e979c3eab712e51da39214710e174a90cdabd5f5588fcb01d2d45436e8019a1026780474e2fde7663495cffa411c58b255e847aa584a38ca26a SHA512 5863e4982c260d39e79db3a8fffd7ca6710b7f6ab0f73f9ddb09860e27d679fe2c92e0eaab9fe6914b38be4390c0eb685adef6624b06874fb43d96027b545659
+DIST SQLAlchemy-1.4.13.tar.gz 7589942 BLAKE2B 08e9fb6112aa71738f27dc4ce86ebe2274dd2513f39ded7211a5617ecd677f37fe31de754a24ecd519b227b141287ad86d0d0337f3d278d4c4ca5b67e2a1a79d SHA512 fb81c71922a768221f6675686fb2696b5e6d1f2e72231611e9afd20b7659193247eef4191841799fb1fe6a51304629efb6d3fba5dc298fdf70f248010bce8bb3
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.11.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
+EBUILD sqlalchemy-1.4.12.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
+EBUILD sqlalchemy-1.4.13.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.12.ebuild
new file mode 100644
index 000000000000..358669239962
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild
new file mode 100644
index 000000000000..358669239962
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/ssh2-python/Manifest b/dev-python/ssh2-python/Manifest
new file mode 100644
index 000000000000..68fe33e5d001
--- /dev/null
+++ b/dev-python/ssh2-python/Manifest
@@ -0,0 +1,3 @@
+DIST ssh2-python-0.26.0.tar.gz 1147243 BLAKE2B 56ee98fa8694d6c9e0c163ec0200c96d8330172c0ae4612f40805ac26da02c7cf64fd4dd49841733c36ed7112c62baa036c901a9ef74a33a92a3d8dc66dc27cb SHA512 35f1a5486bc54bf2242d5b1d2fa24bd5365ffa864a8ae0f4a9f8d96f155ba0877e7dafdf87ea9988b146d8a36c203e44ca9a36a83a5060568bf798468e4a8116
+EBUILD ssh2-python-0.26.0.ebuild 553 BLAKE2B 57be3faa26e8e0c0d701006e1d0e0ae3a99ac45dcc6edd5a883ffd7ab806765654190e35e7d578586f96274378591edbf686fcee7c45e59dac285163fa0ac7d5 SHA512 8540f0c62bd1c390144156dc0e35f87e94d3eef4e084d7bffd2f1b99a6997c8b36899d3b64fa8be6695869b01c476207d4957424ae7c36885aa99bbda054d53e
+MISC metadata.xml 389 BLAKE2B 9365533a01689688c64ce8a0f1b5a54ec1461293169e1efca0a8c9d77d4346a3f0483afa904374da4c5a77fc896d196097c33ba940ad2c8341b4bf7c6521672f SHA512 914831b72c7f5ad13918c78fae9c79ea5389209ceef69f9f7d1f43f66d34eba4038772df58d8864e45e8c07d0a708ac903442703be09dbade160bdae3f7d83c1
diff --git a/dev-python/ssh2-python/metadata.xml b/dev-python/ssh2-python/metadata.xml
new file mode 100644
index 000000000000..e796b5cdc6d1
--- /dev/null
+++ b/dev-python/ssh2-python/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ParallelSSH/ssh2-python</remote-id>
+		<remote-id type="pypi">ssh2-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ssh2-python/ssh2-python-0.26.0.ebuild b/dev-python/ssh2-python/ssh2-python-0.26.0.ebuild
new file mode 100644
index 000000000000..c23977ec892d
--- /dev/null
+++ b/dev-python/ssh2-python/ssh2-python-0.26.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Super fast SSH2 protocol library, Python bindings for libssh2"
+HOMEPAGE="https://pypi.org/project/ssh2-python/"
+SRC_URI="https://github.com/ParallelSSH/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-libs/libssh2
+	dev-libs/openssl
+	sys-libs/zlib
+"
+python_configure_all() {
+	export SYSTEM_LIBSSH2=1
+}
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index e053c77afb6c..314ec1ed460a 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,7 +1,3 @@
-DIST symengine.py-0.6.1.tar.gz 112123 BLAKE2B 3b55ddd834c7401a5a211e5e20bafbea68b172738c6388e72b1e6a6e62719e19f28356fb6156caa6cfbad59d051de45c0e103a89d675e3453136cc85e638f327 SHA512 09f452757e3c99dc9d896a322a07d58f57af6d57a9eaa615b9f4f3d834cfc91f6a79de955a36ad94bc30c962365272ef0afe401570583af49c015295ccd7c4ed
-DIST symengine.py-0.7.0.tar.gz 107575 BLAKE2B f3651d8ee0dee83184871a25fa8535802efead1912684d309e6ab6b63ada53af94146ddcee3df8f87530063991a1d6463d2b14799bb9622606ae5eb37792938f SHA512 73df1c9c678127d3a17e2434ad326793ea00f6c6774301d1da372a8a33f733593e873d98866d31315f22430b427fa76d5f1270b6b308a7473d9877a75db3aca4
 DIST symengine.py-0.7.2.tar.gz 107747 BLAKE2B cacd11f316df5132b6bbee356fd7a4c2d3fa30e80b144c5d8982fec1b6856ca3c839ef7a6f8daf4e70a27462fc43870d05fa76ece085e5577a1672b8e9910127 SHA512 afde47e5f6274a02c6ca138a6316bf0f7ec1c7585acaf4ab19ba849280dfee9ba937c3f8f5117e70f2a6377224f6dab9757958272f4facbafdc11d7965ee7a84
-EBUILD symengine-0.6.1-r1.ebuild 1174 BLAKE2B 5cd488162dda470b81f5f2600dc751969fb63ab1da2ecff9b71e91f2e854a255bbe0cad04173e3a50f75c2a2576c0e4154229821095b28ad0d8ea952c955ab14 SHA512 063be7cac53f6aa39516dfac4f028962f27d487942c0e9e1c135f8e275ab2365a57eef4a3f04dcfd110216f345c59ea2551a2f59d453a984c0e1dbfc9b3813b3
-EBUILD symengine-0.7.0.ebuild 994 BLAKE2B 918647a258b4fa1c7ef849cb4be9738285db2b4c3c0362a5805a6ccb70c1b9211b9c905e6c6fd8e476c46c2984e726ff41e50389cc51f37834d9bfb4e85a76ee SHA512 ab65aab548f97ffa35fbd04bc6b983a015293c5bd022153ea1316ecf6bcf647a044c2bfaeb663ae45c9d87ab949e522ba9de535c9c9cf2da00f91b40148d9e3a
-EBUILD symengine-0.7.2.ebuild 994 BLAKE2B 918647a258b4fa1c7ef849cb4be9738285db2b4c3c0362a5805a6ccb70c1b9211b9c905e6c6fd8e476c46c2984e726ff41e50389cc51f37834d9bfb4e85a76ee SHA512 ab65aab548f97ffa35fbd04bc6b983a015293c5bd022153ea1316ecf6bcf647a044c2bfaeb663ae45c9d87ab949e522ba9de535c9c9cf2da00f91b40148d9e3a
+EBUILD symengine-0.7.2-r1.ebuild 1046 BLAKE2B 17203a12952f483797e4886259e1fd0444835ad41ca7f7f8f04a93982c79771c2d6257f72dce62f4be482f6b2603d5974e5d962d8f6f9681969b521f5e2a1f87 SHA512 ecdc9283f34b355177e03a58ab9d34bf78dfdbc0a4c5ca16495e9a7bc7f21a67cefadf6c4f7cb3b69559f577c425cdb7d0299cfffd8a355d719ed3865b98c4b0
 MISC metadata.xml 403 BLAKE2B e8b8f7b50836a7774a3f6326785fdafe1ca7e52086b163deaf97a76be9440858b56a88aaed86f05db71794e2b5999731205da73250f49e093935bd69346afb3a SHA512 5fa64eb4fc76db979dc3bfec18c47db689dd326ec682a0141aa001843b267cbe479c43acd9a0ef9d5725baab11b16873d9c2b85fd50e8527af2022e81da2f8e0
diff --git a/dev-python/symengine/symengine-0.6.1-r1.ebuild b/dev-python/symengine/symengine-0.6.1-r1.ebuild
deleted file mode 100644
index 9502e110b4be..000000000000
--- a/dev-python/symengine/symengine-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MYP=${PN}.py-${PV}
-
-DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py"
-SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
-S="${WORKDIR}/${MYP}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/cmake
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-0.6
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Don't install tests
-	> "${S}/symengine/tests/CMakeLists.txt" || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	python_optimize
-
-	rm "${ED}"/usr/share/doc/${PF}/README.md || die
-	newdoc README.md ${PN}.py.md
-}
diff --git a/dev-python/symengine/symengine-0.7.0.ebuild b/dev-python/symengine/symengine-0.7.0.ebuild
deleted file mode 100644
index 6de666c67a51..000000000000
--- a/dev-python/symengine/symengine-0.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=${PN}.py-${PV}
-DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py/"
-SRC_URI="
-	https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-util/cmake
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-0.6
-"
-
-distutils_enable_tests pytest
-
-# the C library installs the same docs
-DOCS=()
-
-src_prepare() {
-	default
-
-	# Don't install tests
-	> "${S}/symengine/tests/CMakeLists.txt" || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/symengine/symengine-0.7.2.ebuild b/dev-python/symengine/symengine-0.7.2-r1.ebuild
index 6de666c67a51..8bf39df40953 100644
--- a/dev-python/symengine/symengine-0.7.2.ebuild
+++ b/dev-python/symengine/symengine-0.7.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-util/cmake
@@ -26,9 +26,10 @@ BDEPEND="
 		dev-python/sympy[${PYTHON_USEDEP}]
 	)
 "
+# See bug #786582 for symengine constraint
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-0.6
+	>=sci-libs/symengine-$(ver_cut 1-2)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 0d9c06e20e6d..2421b0dfa75b 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,8 +1,10 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
+DIST translate-3.3.6.gh.tar.gz 1140841 BLAKE2B 77d8b930ba8a91e801a04c67bdd13c0c6538d4df2418f26e1f6bfdb98c275fe746062840034c5345dcf61abc87ee6b8e1b2cda34a71c8e3850ac37df707b8a34 SHA512 c6eedcdb9ecece4804c25aedd57de37da12baf9b2f3bae1c87377f9a07e1e5f1cfeeed8073861b73201de3b35ec4e5da5f972d775c7ff35fa7be21c97746435d
 DIST translate-toolkit-3.3.3.tar.gz 5903525 BLAKE2B a21c5d89c808615ff2f3f718e732ce5d5591a9d8a997950ae1066655cc3e4382065f75e7a86f8e37bdd0e146283f9bd941ff20479cb1af635f393e0e7f8fc196 SHA512 41964dc26dfbb983b1c2e4cbb0e9d8eb2a035369a94ef872f7703080b5ca0280a9364916a1e1256cd358b263bc72198e767462cc9065b54556fc481d1b85a836
 DIST translate-toolkit-3.3.4.tar.gz 6060105 BLAKE2B 01f8e718a4a60d0f4d439be14b30b2e3f040045630d6f6254ad291a2558d59718521bfb79761d20933f7bb1abd2229ccce67fd71ccd54f6e43dffa7e7ecedd8c SHA512 6bfc4387aa600610fa2a9e7e58368924768ddcc8eb2a697ef02c59682e1e1304b7096f48a1e6e38cd47c68c644dff01d35ffc988d378dbf4833b41d1c5432c05
 DIST translate-toolkit-3.3.5.tar.gz 6061630 BLAKE2B 18843344acf8eecf6d1859e1c6d6148046ba3adc56d00413234e1fb755e7cc14f3ffc22d9cc46b249d01ea5d4b73b4edf4d8c6a22ddb882c62183e1f4ce8dd23 SHA512 9e5837e487b7ec703078d6babfeb2fc720c4c4fd2896e5a23839a856d76f6372d5d3c72f5f1e20ee9d130cb2224c5d8a5b9e33e0154484edd0e0ed756ae8429f
 EBUILD translate-toolkit-3.3.3.ebuild 2490 BLAKE2B b9a141e9ff4920fff39ee14ab65433e9d7ac5ef14b7080730e1c1f7d165fdfe539a507d3d8ca73329864cb84739dded979ca8a31ab1f36c426f14e71f42bb1d2 SHA512 a9cad20219d6b808639501bcd1288731dca962576d880efac3c083b5cb953b04b0ddec236ac3e924e55dce1d74c0a8547872be3bb9036914d7b5bcef52b40c3e
 EBUILD translate-toolkit-3.3.4.ebuild 2440 BLAKE2B 55b8d6301b6d8473fcdf85bd54b091441f6f6a01a61c07d6d1981930741e04e0cdf93e29961cde928f1ad8d6ba20b6372b85c4c773f4b8de2a169885e691988e SHA512 c2998e8495b02a26ea5c3e46b5260f96ca3a422b910fd70b52d84515f7bf5dc79cb7fa75475be2af20e5d0a852d61ff01fcfdd4468d8a9d83a0396f2a7d28018
 EBUILD translate-toolkit-3.3.5.ebuild 2440 BLAKE2B 55b8d6301b6d8473fcdf85bd54b091441f6f6a01a61c07d6d1981930741e04e0cdf93e29961cde928f1ad8d6ba20b6372b85c4c773f4b8de2a169885e691988e SHA512 c2998e8495b02a26ea5c3e46b5260f96ca3a422b910fd70b52d84515f7bf5dc79cb7fa75475be2af20e5d0a852d61ff01fcfdd4468d8a9d83a0396f2a7d28018
+EBUILD translate-toolkit-3.3.6.ebuild 2469 BLAKE2B 2aabcafc788c07285359021a60301e57eef231f98e562f582bd855e26e49c5b8c745e28d1ea8c356f80cb7a0360e3a44899af206cb260bfb97fcd799d33e3e48 SHA512 00c836a23ed0d5b4adda399ee7cf0ed8dc100d10191a23c68f99bab10ddab126512dc77c828da2e1ed33858ae1336cf4919c1b8791bc0118c83466d04ab604e9
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
new file mode 100644
index 000000000000..b816d199c9f7
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="https://github.com/translate/translate"
+SRC_URI="
+	https://github.com/translate/translate/archive/refs/tags/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	!dev-python/pydiff
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+BDEPEND+="
+	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-bootstrap-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
+)
+
+python_test() {
+	local deselect=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+	)
+
+	if ! use ini; then
+		deselect+=(
+			--ignore translate/convert/test_ini2po.py
+			--ignore translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		deselect+=(
+			--ignore translate/storage/test_subtitles.py
+		)
+	fi
+
+	# translate/storage/test_mo.py needs 'pocompile'
+	distutils_install_for_testing
+	epytest "${deselect[@]}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 5921837cc80c..e5e5ce1a8be9 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,5 +1,5 @@
 DIST treq-20.9.0.tar.gz 60142 BLAKE2B a495b73221ee86163a5fefd03c8019f4b671a1f32d2ab304b89566339a36aaec7245d33b738b646fa48c42f4db9744938637ece058e067ee3f747e53ce442ab8 SHA512 c595ad69d5a9c688ca966cc897db669a57d14027e0bdc345d550f791390099743749be4a41294e61428cdc7bc0fa197474be780323b00f17a712505e081e7073
 DIST treq-21.1.0.tar.gz 71018 BLAKE2B 44223c0ad618f4a57283db60063ee2fd263f958ff18d90b055733fc3bb24c87483a7b833e2210197a4edd003cb3f86647bbb636a9692e5535908b19e0186dba8 SHA512 b68ded90021cb801b276d6310e729a985205bb0701b1d0576b00c6c4efd97400625efffa35763ceef8f0f8d94172cae6fc1abdd3de1c0a4871223d4f06758d89
-EBUILD treq-20.9.0.ebuild 1551 BLAKE2B ef384831ea1df1b4281ea4218544d67346e5c76c5ae61ac286a70c53678c556190e692e323da2cae79fb778b4ed0293e523cd98ce14f3db64bfc16eeda6aa5da SHA512 3e16644ffb5220c75eacb223988018ec73c1b3c8818fb7c40892672e534f376b7bc89f615a88af734d0357e4d206788636ec6d577c21a0710f1c4985b9b1e1fd
-EBUILD treq-21.1.0.ebuild 1562 BLAKE2B c6b4c9eb48d0013ad9acc4c72150aa2fc7921831768ac44aca42449746fa5ab08dcadb0d9de528784a85b18594da5d7b953727936f6ac29d659fc191e1a24bc5 SHA512 1c2f9161618c58183bc6b1a81cc6ad0e9738d8319927367ae8984ff08b74a3d921c07e6bdc91636f4238bd5ef3232163220d020b9351528a62ceafccdc3a7268
+EBUILD treq-20.9.0.ebuild 1552 BLAKE2B e96643e5db58330b4ae89681821d17d2907662d09f86d291157b36f7072172e162c0bf8387ed0be11e8edbd83ea43ee7ace004050f7179fbc7ebee731759d323 SHA512 2f08bdea0941edaa8359a7ba9e549c796461195179c9eef3c3e6f3df6890f46671f72fe6423416e480315660789b8437559faab798b7a0c3b2adfcbe2eed98c2
+EBUILD treq-21.1.0.ebuild 1563 BLAKE2B f8c7f22fd8231617ffd1e00c84a9b84a60d834180a034674cc19d044667ec20f4329dada4f1bd5344137c7bf1286fd530b18064426739f4826b8e7ee9df529bd SHA512 3c32cea95537342362e8cbe56c810c373173bc83f96629bbebef31f409ec2a3f2c08afd0689c864072d4435ad8af52bd509dbe8b28b65147f0f3aef9f908f250
 MISC metadata.xml 679 BLAKE2B 1218e13a10ef3e4b63b892d3ba444116d8ae3bdc625c9b95ef73f9c4d59dc7bad527e919568306e7744b79a9bb00dea90ee0b83146bc4314d224e2dc7657cb7d SHA512 b3d2aadc2c43d03d80d50fd67830e62ba7543dc7ea7e0f834b32a7738031a49a8ab57069b8d5c7a9b0f88405bae8d59333e50ecab87286f8be5504141081914e
diff --git a/dev-python/treq/treq-20.9.0.ebuild b/dev-python/treq/treq-20.9.0.ebuild
index 0899f2b509cb..7b1c82412801 100644
--- a/dev-python/treq/treq-20.9.0.ebuild
+++ b/dev-python/treq/treq-20.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 }
 
-test_instructions(){
+test_instructions() {
 	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
 	ewarn "dependenciess are installed for this package."
 	ewarn "Please run eg:"
diff --git a/dev-python/treq/treq-21.1.0.ebuild b/dev-python/treq/treq-21.1.0.ebuild
index 8ba0d791aae3..b5f62bffd38c 100644
--- a/dev-python/treq/treq-21.1.0.ebuild
+++ b/dev-python/treq/treq-21.1.0.ebuild
@@ -47,7 +47,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 }
 
-test_instructions(){
+test_instructions() {
 	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
 	ewarn "dependenciess are installed for this package."
 	ewarn "Please run eg:"
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index d6730530f0b6..0dd4fac35f40 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,3 +1,5 @@
+DIST typing_extensions-3.10.0.0.tar.gz 45509 BLAKE2B 34730a537f83bdb6fc126cef947621ea13e93ffaa0ca824d4a60319c57b3b5f79f640bf59b2214d6287d9311c92487da396313e327d2122646cb6e1dc8e3b17b SHA512 1c262aedb092d506bcd90d033a640fa6e1f9131f95eafb77d30ed21ff7d6b0f492b6092d3523ecb773bc54904679e0fa1aa8c3b4af62d77f1a7e6fe5fd6cb10c
 DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
+EBUILD typing-extensions-3.10.0.0.ebuild 741 BLAKE2B 523e0ac7e6024a12a7cd64409a3c223722273c68f820fff0e0ab56720f8901ba0acd15f1c900c23337aa9aa0f7ff0e62b4f868588b954d3b868769fc4726c234 SHA512 973c92cda6e409efd65477f80b20ad908232a0c5313a77eca2ce1add1d8e67be47319483816e919c3476b3906b3628d19e210964daa5680829830f395d45fcfe
 EBUILD typing-extensions-3.7.4.3.ebuild 733 BLAKE2B bd11089d030b3c95a9c6d6a4c58d117ce52fd8dfcfccf1bf3c735014d02f9966ea1ff680a4162faa4bbac82a4fe30f7ad9d8b729c88a8516545f991fb9f3fa88 SHA512 dc06bb47945d839eb9a214333dd49936d8645296378b63858d811c26039188f6a141af6dc80f1aecd6914d3b554f16eaf66db4f2956e71f24a2938548cfc96d6
 MISC metadata.xml 397 BLAKE2B 2eeee3841e9ca728cf2ffddb95f17521d7f57f8f8b85d3dfb30200fd666a69d39e31190a15ca0cfd039d253e81497514cdf99d4a44e9cd2b47f5a3d3c5e85291 SHA512 6850714adb8b2e46bfb6cfa4beb97f097547c60c9362a355534a35723f9a667f4c1be645287bfa27e6ceebe4dfc7607ca2ec7e12ff1d539e9598c911fde54825
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
new file mode 100644
index 000000000000..3c574dcd9ec8
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Type Hint extensions from Python 3.8 backported"
+HOMEPAGE="
+	https://pypi.org/project/typing-extensions/
+	https://github.com/python/typing/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+python_test() {
+	cd "${S}"/src_py3 || die
+	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
new file mode 100644
index 000000000000..da2f1cdbfcb6
--- /dev/null
+++ b/dev-python/typogrify/Manifest
@@ -0,0 +1,3 @@
+DIST typogrify-2.0.7.tar.gz 12903 BLAKE2B e08b27a531f21e99d5a35c47c1deb94bc7f67e31a47789ba4750520c893633966b1319a731c81ab2435e7024aea1e8fd0b46a52bbb73a050cdf83a1588644d18 SHA512 6212024a88372f1b14e5932c0541ec4d5a2ada7514c1327dc8f3775cd7adf3372cae0037c4310ed4a03fd0657a91eb4c0d114b74172190f7f84d82908441ddd0
+EBUILD typogrify-2.0.7.ebuild 661 BLAKE2B 9169151c1444166ce7916b73a8730d5a46213edc1b91b71365e07575cf47338e0d7b0f4b028e5f6f8472b66f1813ebe155cdc7bb556c86cefba901c3f4d58c14 SHA512 88d3b6ffe25ca56e783effcd7cf1b151323ffe9a6f2b61a30b189614f0a145f7021e884f54310a848f2af6e732b6b026e8d09b8d6a2fdcfc074fd996e3c25233
+MISC metadata.xml 463 BLAKE2B feb4586174307a87c89200cd8cf12b597cda32c73b9ce945075d68d7e69c37ed06404316a7473f91d278d3b7649d3e1dce347e550be1b19f81c7d06a36111924 SHA512 7d629d2bf2c3d34cc4922be9b27ee09edbce594f52806511b82dcd8bb270572dadd25513cb00d021975c3978f0a9d1dffe79b0874f61179ae970c54d6f2f3029
diff --git a/dev-python/typogrify/metadata.xml b/dev-python/typogrify/metadata.xml
new file mode 100644
index 000000000000..288c408a5ef4
--- /dev/null
+++ b/dev-python/typogrify/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">typogrify</remote-id>
+		<remote-id type="github">mintchaos/typogrify</remote-id>
+		<bugs-to>https://github.com/mintchaos/typogrify/issues/</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/typogrify/typogrify-2.0.7.ebuild b/dev-python/typogrify/typogrify-2.0.7.ebuild
new file mode 100644
index 000000000000..9b24bf19f431
--- /dev/null
+++ b/dev-python/typogrify/typogrify-2.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Filters for web typography, supporting Django & Jinja templates"
+HOMEPAGE="https://github.com/mintchaos/typogrify/ https://pypi.org/project/typogrify/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --doctest-modules typogrify/filters.py typogrify/packages/titlecase/tests.py
+}
diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
index abf4db186a6e..632fb7779c58 100644
--- a/dev-python/unittest-or-fail/Manifest
+++ b/dev-python/unittest-or-fail/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
-EBUILD unittest-or-fail-1.ebuild 820 BLAKE2B e1383676813dada66a0aa203ee56061bd9cdc9aeea501f74c00b65622bc27a831a569ace2885fe0e15263fc507bd2183d8d58f6116a3316ecf1052c3b6f72481 SHA512 c852a7f5c7ff816353619560a1e9382892b44dac02b7c1264f827eca9ff02e2d60e01485ba56ed1b191888134abae4df34e130bf678bd048997fd9cab163fcc1
+EBUILD unittest-or-fail-1.ebuild 821 BLAKE2B f350ef277ded20909e0c883a2ddf7d3d2ab5ef9b551e8a939cb3a9ca6e97864952dd021c460f96cb53063ac1ad818bcd3db9d31f78218c61cde63ef585cf9340 SHA512 a91be138c424fd4ec445c7d993aec9bc5650ea8d0b5ed4be144b561cdc1b778ce24ead3f44a13845d03d243d0acc52d0a82fa2e5c98abdabffb9d8be3ac0dcf1
 MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
index 735771c62d89..bc3a13de7e0d 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Run unittests or fail if no tests were found"
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 456471f62103..6100483cb7dd 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,10 +1,3 @@
-AUX uvloop-0.14.0-asyncio-test-hang.patch 1175 BLAKE2B e97cef3438a603249e8b1977b2a7f3d3b636d3f38c59c4075c01fc0660b6afd01a64528655bd9bc9c0845fbd88c86f8b0ad5571052a02e511587fe73d87547fe SHA512 e8219cc1c644c220d7626790be5fc701ac27486689b7bc57b70dae818c51be8b3d1e524684cbaf6aaa2de199159b1af9534a913e7d8f1c209b87e3a2208dfb43
-DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
-DIST uvloop-0.15.0.tar.gz 2086686 BLAKE2B 34bbce58f47a4da1c8fa27011c4a39e864ba1959affe2584eb33425ddb3fbb3a59783e3cf771669cdb1343299bbc7a7a8a14f4bfcbf2b694ac71b9fc055341d1 SHA512 fcb18511a1af89c11cd4022ecb6e8893915a159b34a054bab5e82da3b9127b886ab3e785a98ca39e612cdf2b18abd95bd7fc505808cccf9d4ac281f5a0b6e0d7
-DIST uvloop-0.15.1.tar.gz 2087966 BLAKE2B 31892cfa2cacb02ae8a78ced2066a60012dfdc95ff9b1d68119487ec543e45fe7867c6a4b597b2ee83632c48d6d53216f648005a6202036e99f38b34b8d5e60a SHA512 104153760781b5596b552f00d0c897144fe2fbe208c2216e94daf5eef08ebde2ec45ddeaf6a24d1b28f9351d241832541a754124229af71245695da262458ffc
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
-EBUILD uvloop-0.14.0.ebuild 1278 BLAKE2B d759bf6d27d570be076ea992a6d93ea5a75cf9e3295b1d13477b8d08116181d28bcb6a09638ef3a0b82269c0b138c72076670d7d173f7ce1fd5a08b595ce5e77 SHA512 7953803d55a77561bb6e8a901125ca9b22cad1d3afeff20e8ec9c9a30e169e2a447639487664e70852ebdaf2c2a0a36e90798d900af2ca63c2b4b8e545845faa
-EBUILD uvloop-0.15.0.ebuild 1157 BLAKE2B 948e1db3e3b64ec8ce9301d0c0b0841595f3b6d7bb5272af8c4a86eb521a1e8cc34c973591fc2613ed8fffd7edde7760ea479cf1c0a013f7e45b6da56a3ccdad SHA512 744ad8ed3417d2ec51ea9ca0cd3fafd00deb46f2f15992d69af9e8824d9b66f83dc4c8526be8ed8f363b6b7187c514f2fe051bc056325d6ca4c273336b80e376
-EBUILD uvloop-0.15.1.ebuild 1157 BLAKE2B 948e1db3e3b64ec8ce9301d0c0b0841595f3b6d7bb5272af8c4a86eb521a1e8cc34c973591fc2613ed8fffd7edde7760ea479cf1c0a013f7e45b6da56a3ccdad SHA512 744ad8ed3417d2ec51ea9ca0cd3fafd00deb46f2f15992d69af9e8824d9b66f83dc4c8526be8ed8f363b6b7187c514f2fe051bc056325d6ca4c273336b80e376
-EBUILD uvloop-0.15.2.ebuild 1156 BLAKE2B 1fab3debd7955e038ce46ae292c2d4f4eebf0f8804a2d2051e781a8c431cce6c2afc3a33cc15eb121da8dbcd28f39674316d58f4c98200800b97d963c65edce4 SHA512 014eedd86504b96c09bcce7af72b6b727b948355b8217199913658280df66081382ecdb604a51719d2cf52cf7b5c3345d3cdeebacbae93c4fb7addb630a778e3
+EBUILD uvloop-0.15.2.ebuild 1155 BLAKE2B 06e3db0b8777001b9e15e61a57446a1b1513809041a716626d7a8efd3c9ac659b5289d081fe7d5ffe932b755547bf4d3a808e02276531c96430249702a00a12d SHA512 257dd7989f23f737c4945a1fda91a2ce2c6dd480cdb7ac7f1124678ffa9d6d201903480b2a06eb65625d5d90d6b7e674c46574e26f28c138522decab3420e36a
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/files/uvloop-0.14.0-asyncio-test-hang.patch b/dev-python/uvloop/files/uvloop-0.14.0-asyncio-test-hang.patch
deleted file mode 100644
index d139d6f66b0b..000000000000
--- a/dev-python/uvloop/files/uvloop-0.14.0-asyncio-test-hang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1549514de9c344ac978472097e750b1caf6a36b9 Mon Sep 17 00:00:00 2001
-From: Fantix King <fantix.king@gmail.com>
-Date: Mon, 25 May 2020 14:10:07 -0500
-Subject: [PATCH] Skip for bpo-30064 until 3.8.2
-
-[mgorny: extended to all py3.8 versions]
----
- tests/test_sockets.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/tests/test_sockets.py b/tests/test_sockets.py
-index 6a8a63f..d9f258e 100644
---- a/tests/test_sockets.py
-+++ b/tests/test_sockets.py
-@@ -194,10 +194,11 @@ class _TestSockets:
-             self.loop.run_until_complete(asyncio.sleep(0.01))
- 
-     def test_sock_cancel_add_reader_race(self):
--        if self.is_asyncio_loop() and sys.version_info[:3] == (3, 8, 0):
--            # asyncio 3.8.0 seems to have a regression;
--            # tracked in https://bugs.python.org/issue30064
--            raise unittest.SkipTest()
-+        if self.is_asyncio_loop():
-+            if (3, 9) > sys.version_info[:3] >= (3, 8, 0):
-+                # asyncio 3.8.0 seems to have a regression;
-+                # tracked in https://bugs.python.org/issue30064
-+                raise unittest.SkipTest()
- 
-         srv_sock_conn = None
- 
--- 
-2.27.0
-
diff --git a/dev-python/uvloop/uvloop-0.14.0.ebuild b/dev-python/uvloop/uvloop-0.14.0.ebuild
deleted file mode 100644
index d3640c25ef16..000000000000
--- a/dev-python/uvloop/uvloop-0.14.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-inherit distutils-r1
-
-DESCRIPTION="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="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-asyncio-test-hang.patch
-)
-
-python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-
-	sed -i -e 's:test_write_to_closed_transport:_&:' \
-		tests/test_tcp.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-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/uvloop/uvloop-0.15.0.ebuild b/dev-python/uvloop/uvloop-0.15.0.ebuild
deleted file mode 100644
index 1ce46b172f5b..000000000000
--- a/dev-python/uvloop/uvloop-0.15.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="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="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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
-
-python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || 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/uvloop/uvloop-0.15.1.ebuild b/dev-python/uvloop/uvloop-0.15.1.ebuild
deleted file mode 100644
index 1ce46b172f5b..000000000000
--- a/dev-python/uvloop/uvloop-0.15.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="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="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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
-
-python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || 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/uvloop/uvloop-0.15.2.ebuild b/dev-python/uvloop/uvloop-0.15.2.ebuild
index fe07d8cc2617..3b9c8148e9bd 100644
--- a/dev-python/uvloop/uvloop-0.15.2.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.2.ebuild
@@ -10,7 +10,7 @@ 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="~amd64 x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index c2a2d5ec4158..2332182b2318 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,7 +1,9 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
 DIST watchdog-2.0.2.tar.gz 95452 BLAKE2B e3a071cdf1c47698cd54bbaf925c4eb7e2af7398ced73aa332e57472cba2f5ce2ce1b96a31d3f5f3a525cabf81d5de528d95d0c59148150f407abb8ebc64538e SHA512 6134ad22b350b7b2893b564c4f02bd35b1be515fa18dd7f7000b191994b5ba48c5bf573819d2f363de227481a6bb8a0a14973e7c6611de367df2a3f228656ed1
 DIST watchdog-2.0.3.tar.gz 95524 BLAKE2B 568e9d66efbfa98c19dab704681dbc48f869b59d51d7c7ff7ce1fd7465efcc6233f871e7f9276f2732692645491f2fd197a639b17e9a3d8abb76d0148a934796 SHA512 e1c506e4ead8c3ee8d19e456b67623f3a1823007be6c1fad0d76c697205696183e7bd15e46c21bf61abce6dd16d267e55da8986633eeee337d10c609318fb958
+DIST watchdog-2.1.0.tar.gz 95833 BLAKE2B f11eb7961885fd0fbf8e6f888a069d77d9ff26b245bd3583e9060044c43a3356d56a334108c8c1a11735fffa779cc750bc390dd1510cf2c549ec9fe064899540 SHA512 65cc291927a61506fd2c26e05b85112e1cc0f26ca851138c62dfa34fae7958ee2b3946ffe586a9d2b7a48d59a6b5ce11c8dac276a3d78dcbeca8da011a880668
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.3.ebuild 895 BLAKE2B b4438d2916609a2605ce3e9df17e6416166ea3afbac1a8e7b2f6fa20458462ced6a3280d6f1fcefc2b76bfb3c3605318f576540287bc17e58d0a3c7dcd082531 SHA512 eb2f0ba137f64555763997894e4e1b26d39502ad2c34a55e87d06482ffa57703417f11abb38cf5809b56be9a4581040364e9d480a7d52dd7a45e9a120f0e52da
+EBUILD watchdog-2.1.0.ebuild 861 BLAKE2B e92a1567235d7b2aa1df0c4f586b539622787060a6e48e9fe0476dd8b2c672410c0f97f03903ad6d770bc45339693d63c79bc26e3b7b716d0cf6993c90589e9d SHA512 5e745931a1edc77df6685ea10c27e042027221c155eef1e4cdffedcf8c67d9ef172fec39613fd32f0d4f56223672f50b8879610cda635faa097d4fabd05a0c49
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-2.1.0.ebuild b/dev-python/watchdog/watchdog-2.1.0.ebuild
new file mode 100644
index 000000000000..0b8865d4eefb
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+python_test() {
+	epytest -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index cb9b3b37c128..0c4ae093f00a 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,7 @@
 DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
+DIST websockets-9.0-src.tar.gz 192076 BLAKE2B f5d2fe0e947b4833a11c013ce64640369794e1c5e4db5dcee7a630d8edd46ba72afd4bc42cd8adb392c09e2758d907a0029e09d61465215b3fbaa2430582cf2f SHA512 446d9734e2767a19a5c84de2676cf3730dc717d94e14443ded01727d47b02fca67546bcebe37d177088baaee61c8a7a90f7e15df1ee5bd0ed0a96bb4e46ad1d8
+DIST websockets-9.0.1-src.tar.gz 191411 BLAKE2B 9e45836334f55c18391fc853c81fe7d2b3929fc3fe19d216498a8f39891c82efaa83608ed6732375e1d6fa2a9c84aad77c99aa3e6f57a9a328ff9168a1e58c77 SHA512 554dc5f272f4f849982a2e2a3d391bc6dfc36dc247aa0e2854913d18772749762db424da38f135f8cf4a2a5f67a379f774faba76eb3113bafe509ac62753bed1
 EBUILD websockets-8.1.ebuild 469 BLAKE2B f726a691f5a392ddb087850b3476a5ae9d6495c182b670aa6287198abe06ecb6b82c57540ae58194252ffb89c90639a8e2e6c0f6bb15606667e2a0df0272ca1e SHA512 f23db3bee0f46176302d491c91d9b27c7e65f9f0e0ea855078fe358a0d36d73be836c8452b8df074733f5e09145ad38e91ab43f837baf38cd0f63b084c0d31f9
-MISC metadata.xml 386 BLAKE2B b7595dce278a7ae3d0f491ebef0abd2d9a84827b4ddbef8ab3ed16e21128713408f66295566b8fbae235b5446f5eba6ebc412e39bb37d86e19fc2fd2b2d34bad SHA512 e007ee258a91392d5fa3cec67a0e1efebb4f3a4a9e3a4ee40a0f76dcd8bf3b1b9089f2ddfb52939a76cad42dc63662e2c365406b867641d3503f6437c3213531
+EBUILD websockets-9.0.1.ebuild 472 BLAKE2B 341463699e5b24a0d9113b2395cfa6b24c73f357775d6dc288b8e07c37789c202ba9258adc391f0a1e00781592786341fea9eb96fb4b1effdf87ef0db102c0c5 SHA512 95d72ccfce9f61145656b4040195e191923e4c5ae9db450c3ff11f3920dfeb617b133ad949216d211eca43600b593c82e0db0b3671263ba18f566ce8472c95ec
+EBUILD websockets-9.0.ebuild 472 BLAKE2B 341463699e5b24a0d9113b2395cfa6b24c73f357775d6dc288b8e07c37789c202ba9258adc391f0a1e00781592786341fea9eb96fb4b1effdf87ef0db102c0c5 SHA512 95d72ccfce9f61145656b4040195e191923e4c5ae9db450c3ff11f3920dfeb617b133ad949216d211eca43600b593c82e0db0b3671263ba18f566ce8472c95ec
+MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/metadata.xml b/dev-python/websockets/metadata.xml
index 98f685d013f0..3380b2dc868e 100644
--- a/dev-python/websockets/metadata.xml
+++ b/dev-python/websockets/metadata.xml
@@ -5,6 +5,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">aaugustin/websockets</remote-id>
 		<remote-id type="pypi">websockets</remote-id>
diff --git a/dev-python/websockets/websockets-9.0.1.ebuild b/dev-python/websockets/websockets-9.0.1.ebuild
new file mode 100644
index 000000000000..0992a9e2d617
--- /dev/null
+++ b/dev-python/websockets/websockets-9.0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="https://websockets.readthedocs.io/"
+SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/websockets/websockets-9.0.ebuild b/dev-python/websockets/websockets-9.0.ebuild
new file mode 100644
index 000000000000..0992a9e2d617
--- /dev/null
+++ b/dev-python/websockets/websockets-9.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="https://websockets.readthedocs.io/"
+SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 9e3e36edc10f..5c72ae6a4ec4 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,9 @@
 DIST xmlschema-1.5.3.tar.gz 350684 BLAKE2B 5dfcd2e00339caa834195729cce1604d17e5aa4705150649e22bebe3dc7b3ac6ace5dccbc7b6313c5cadb5ca29992853191afff2f76f05d18c10294131a904cf SHA512 3d86dc407d3181bf5c34b2d6aead9995eca1b7210b39ce3cb95c5655fa0cac0bbcc9f15c6ac016aca69a23f19befbe0525d6f13644b68fde348dcd0fd03bfa73
 DIST xmlschema-1.6.0.tar.gz 362175 BLAKE2B a9ff2807e3371ca81af3f0febf555c3fb5cea0b3623925e5b9c5f7b48df8e7c7118f3654930dd13b785ab1f1816d43df08316ddaeca2df983dc3f611ebacad10 SHA512 d72c85307b2b22bb59ed3331a1fbb8fd4ce58e69fed1762e37b89fba6c2f704753123ae34bb6155bc60d287461e426eff48b2b6a04899f067f0f235129320099
 DIST xmlschema-1.6.1.tar.gz 365094 BLAKE2B f39992b61b6ebdc6f9e9a8a83d004bbed0d74bafead7f61e20ff4adb9c135e8e50fa8f7bb20d6ccbfd95894dd62c8cf265d40caae29a8020b73eabbd2366c282 SHA512 be766649f43c297a3ae593bb59244199c52f87bf5f85eb54f5ee8e7cc7a8312aa74ed45198df63a43045840231339203180b7175ac71b850640c44aeb67b5ff5
+DIST xmlschema-1.6.2.tar.gz 367141 BLAKE2B 32a1e4924765badc268d2d68458c4d6d0409c5f3b4e0109487cc538aec300817cf0649a43f77990e82b2c54252b2ab3e0593a503c217893661480f1632491f41 SHA512 5aaf022451fa069b2361af542d4d864995e8dae7d50f5e66a5d5567b4d8511bb46b5dcec68a780e89025ff02f5bbb6311c4fcd4fb17f6c24c0c02b00c6b4a341
 EBUILD xmlschema-1.5.3.ebuild 809 BLAKE2B 6b29d4d472ca9956ed9120a9e0fb827dcf1f0e85580356655a6a91e14e30d74748eda7360b04a5abf8b0816f8b6b396189cf8759ebaffbcdf439982e2850dc42 SHA512 abea1108261b85c6259d9a409e78b5a7526ea3a41eec59ba046378d16550927778571605a40ea1035630af7d954ab7e98c2d2f84ff8d1e8a610a17b2a9344d50
 EBUILD xmlschema-1.6.0.ebuild 817 BLAKE2B ff80a957b8e070b29c040a507074b7a976d8a98763685389bbc9f214f594297b7dc6b91e399ea5348ee4a0e37e06d5a74075621b1a13c1dd928e2c228bc52a11 SHA512 8e4e78713a553a45ab106797a1c0b44a8a9b4165b59feac81a730ff2108d7c6649ccebbd604d862495793b61478d8b61f26ae8cfad6757db53dfa123f8b67b55
 EBUILD xmlschema-1.6.1.ebuild 817 BLAKE2B ff80a957b8e070b29c040a507074b7a976d8a98763685389bbc9f214f594297b7dc6b91e399ea5348ee4a0e37e06d5a74075621b1a13c1dd928e2c228bc52a11 SHA512 8e4e78713a553a45ab106797a1c0b44a8a9b4165b59feac81a730ff2108d7c6649ccebbd604d862495793b61478d8b61f26ae8cfad6757db53dfa123f8b67b55
+EBUILD xmlschema-1.6.2.ebuild 783 BLAKE2B aba25e63519c924d5ab4947270fbee192a1d8472ec8ab7abef3c647ca87cdbba7f214c23c2b9e0a6168cdf76bbfca66b49defc9aeac555f73eecd6bf84480725 SHA512 b2c6f64e7ea3e3d5cff5713d80bb2f9ba4cc821e4f1d6f7ee7acbf8c1e73f994a596eca1f90b31db65092a340e8fe23c1bf831de28bfff991c9cfae7a3a76722
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.6.2.ebuild b/dev-python/xmlschema/xmlschema-1.6.2.ebuild
new file mode 100644
index 000000000000..db475aba195e
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index f7a1ebac0cba..f06d587d9a04 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -5,5 +5,5 @@ DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923
 EBUILD zstandard-0.14.0-r1.ebuild 777 BLAKE2B aa61d4659110f07d40acfdd5e3c31e8557138ed9266323337d957dd588a838e8bd5eccab02d6aac549f014d7819fe5b50f90f782c02b51b806dd28b39e65bb91 SHA512 3e4cba50c243d2604b53eb5b284343427aaf1912c4cf1362ae8cdc19d3475c6e293ccb383ca64c7a95763606739ea4b7628c0e698cc4b95330de16ac27673f45
 EBUILD zstandard-0.14.1.ebuild 779 BLAKE2B fc38dda68bc290c1dfe450b3733eee2eb241ef7e213efe3e8cb60f5a47de6034f11b0822e04e61774bea2a17562d0d1332f393352913d77bc800d33cc4fc625f SHA512 ad392c8eaba60a3fc905840b17e50876ca98bdbb109998095eff564eec8cb2e39d742fd314f3786a5afe924e369703f7b160abf630a0cd2dfb664f343c940705
 EBUILD zstandard-0.15.0.ebuild 780 BLAKE2B b9918626f05487806c337a5829a0fd7a9f086b419bc4e9dcaaa83c38b4c17622141aeeec92f0da93ffcb160e39a4e93fa6a6e721a6d92e4cad4e7d3d4b30fd07 SHA512 eb7c3a0d07377e9aeb19c9bf0aa5f506f36dd4681ededd70a41a0b4d6a796c970f4c3b9d46cf7555f8c509278aa1c56f8917340f08338ea6a31427e5a7b867b2
-EBUILD zstandard-0.15.2-r1.ebuild 1175 BLAKE2B 3050edd63fac5cfa77ee0a66a51719ecb7665e8c2e0b6b1af801e442d49be7e87e0596db8817702c3f64aa1f4d6316a0c68083ef8d28be529e86ac5054ff4ddc SHA512 b3dd049309d1fcc5d846a771b231e160bf9df77c9533c333bd278ba22ab94a313734005af35106320537a7f9dd551b13a48ce0baf3a6937d8e6709e268a696a1
+EBUILD zstandard-0.15.2-r1.ebuild 1173 BLAKE2B eb95e2e7daae74535f44da3ec8ff6abfd949ce49d8f6aa3cf23f503c47d82c165b235ba259778589bce54f8b7490b753b2feb0a78685a1420a44aa118d67c6f4 SHA512 3499e4d43c651f0635628b5f0bc77b1c27df9069c64d21da6ec5ee93c68ce1997a707abc53d4d3f0859e9fa3ddce7fc02a1993d5f35e5857f97d450367388d42
 MISC metadata.xml 377 BLAKE2B c14803b618b3badd945f8b01ca90ed6f809d9d2648ccb59554f947fbf5910e613f741f83cc020b70831ebf70b579a0e1ed33d3f5f72b858ff280082938516196 SHA512 fec606ee1d05384ce4433e90433e54925443afae244ced5276787a6f416a96017dbfd03dd9ec15c2526a943ff6348827e13719152478fb2cf609017cf8359a45
diff --git a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
index 8fab8e6215c6..9fe9f82f6489 100644
--- a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:="