gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /dev-python
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
1149 files changed, 10068 insertions, 6179 deletions
diff --git a/dev-python/Babel/Babel-2.8.0-r1.ebuild b/dev-python/Babel/Babel-2.8.0-r1.ebuild
index f970db31cb9f..c7d4b499463c 100644
--- a/dev-python/Babel/Babel-2.8.0-r1.ebuild
+++ b/dev-python/Babel/Babel-2.8.0-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
 DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/Babel/"
+HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -24,3 +24,12 @@ DEPEND="${DEPEND}
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+src_test() {
+	local -x TZ=UTC
+	distutils-r1_src_test
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 9c3fb2c9274b..193c3def2410 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,3 +1,4 @@
+AUX Babel-2.8.0-py39.patch 7421 BLAKE2B 94a9b55504214b4c422cab61651dcc4c9192f438635e0ec6aa77ea1b53fefb782dd4a1d13ba89500fc2c2e13bebfc616529aaf74c18a55304fd23c2c53fb77cc SHA512 8d738bb0140c80bb2db8a2180c563f61500df42de1b69f0b2a36dea23aad889fe59451fca993161f6ca6a2f6006d98ce94ab139eb5be4a1a25f43e922e3fc9de
 DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
-EBUILD Babel-2.8.0-r1.ebuild 830 BLAKE2B 6b2636c528f62265ee7b9ca79fb8e45df8e5668a3dbd84993be4573f9c095cd888656491cfae76233d047768c030d440c748967eab083778ccd4b02dc921faf8 SHA512 e93e0f647da7baecba64ba13ad3029399b58ecf97b1ff7b4ecf7654dd1439fd677c528a658af2c03fee29f8eac7724702f25513998470e40554c0e938c42acf0
+EBUILD Babel-2.8.0-r1.ebuild 930 BLAKE2B 18d7eb5333ce5487b22d6c43504c53130a62262918fcdef70fc509e0167d2f53df279a499071ae2d1d686a07a2242898b05b651017e1d8ec82ac8954c8986a8a SHA512 6ef9304ba4b345756c3f80b6f0ec141d5310912177335b8ece236357965ea93132d30da4f2934d3cc315400fe0978eedc8cc0d71d7d6a6c934c3ee2366b3cffd
 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
new file mode 100644
index 000000000000..efada9c1d08c
--- /dev/null
+++ b/dev-python/Babel/files/Babel-2.8.0-py39.patch
@@ -0,0 +1,169 @@
+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/GitPython/GitPython-3.1.3.ebuild b/dev-python/GitPython/GitPython-3.1.3.ebuild
new file mode 100644
index 000000000000..4ac8b651ff03
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-3.1.0
+GITDB_P=gitdb-4.0.2
+SMMAP_P=smmap-3.0.1
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	# remove performance tests
+	rm -r git/test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' git/test/test_remote.py || die
+	# broken apparently
+	sed -i -e 's:test_rev_parse:_&:' git/test/test_repo.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index d8f2be879061..1ac7e9f561bf 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,8 +1,10 @@
 DIST GitPython-3.1.0.gitbundle 8618276 BLAKE2B a1ecf49c47804b399453c6931fb54903309944b47a5a8ccd02d62f4b27943e60b4b58a9e67567008fa4d5bc791b1c86642659c045c885e2155e2c44bb1a4ea81 SHA512 a71463f861f840d3169a8351155665243d9f0f0a72e210940f9f7872cfd49b6ddfac827f0ec5bc61079d8066fc7ba210a03dd99f3bbd598e22ccbcacfe8e61b3
 DIST GitPython-3.1.1.tar.gz 430310 BLAKE2B f6402c4f8d72f4352bf97b72ac0c39b347683c411dcb7b74405119773954a185fe7dc11e13232d56f4a9f938e64b865f42cbd3a857427d985e29f024eb4e0880 SHA512 a913fb611479456d4b804c56039ed8d8ac8cb183f58c874e265141f2b5b46befd4a8a2f5d94ac1cf8ea7fc99e901568a9fc054d50df0ac242d7d184add8ca1b3
 DIST GitPython-3.1.2.tar.gz 430474 BLAKE2B bda0fc9d591dd3b64158e318386349c18ed0775f462c487726faed7ce10781296103133b64cdbfd56947e38621790b177b6c9869596dc8a523a17b00690fe5e4 SHA512 051b59b56a163839bf7754860bfc8e21cfde08b8e7d0fd66239c234b89ba5a83fa7e8540a12c5df3563e5353d1e01119dd1b0a5ea1c22daf7e071fb963cbc3a4
+DIST GitPython-3.1.3.tar.gz 430558 BLAKE2B 0a36e066ad4d3d994ebaa76492f4953c0eaf8b4a0fc163af646f288ed45591e0dee532502c03007af5f6d6cf5633a32bc12a9a777fad6d745bdbc286a4815de4 SHA512 ea4043c8be79cec7ffc9c6b6383be37dcf7b4a877cf02d6fc8c9e7d39a5005e088c8780dd6e0fcd72c0711c997228f417773c82572f569c5ca1128f5ebe56736
 DIST gitdb-4.0.2.gitbundle 1474197 BLAKE2B 93dc8aeb3a43f0950bec1e8dc0c0156543a0a1ce1f20a7f0b2cd05c110338af05b6c6300c3f4b2c05e0f895496248e5fdca74eb599a4ea9aa983ed399d91f7c6 SHA512 8d4ebc93d6869a60b7717fc090000067e86a7e0373c281d0fb9939a6e2e283864256f827919eeb13be977254c0c71a4864d8e7c9b4b6dcc0af6275aa59681960
 DIST smmap-3.0.1.gitbundle 263781 BLAKE2B 6e06586010814ce0f59367c7f9289dad4891ee1debbc020b192af3945207da05b1e34907f1871f5b6b9638706b9e2fdacf390fcfff6bd06af84b9fd80f7e63a8 SHA512 c2b6c0b295c2997ed53727d3d1458ae7ec5ddbde9c83349286904726865fc026a70161955498b1a06371fb8d937e7386b80b4ea0c2e5d1c647718e6dbea93104
 EBUILD GitPython-3.1.1.ebuild 1565 BLAKE2B 188eee0c7d2caafe5aa17989fa5bec5f903b42ec644805b69b03fedb82325aaa3a47987062d685e5b427775505b6320b974cc594cff1ceb5878468914796cf9b SHA512 5153569d57e66bd7698de8e7adc3fcfa8ecbf79ab929364bd16a368afdb01390d79195f1880b17e9e9e2e67b22aa4713e812eeea4c65e00c19cca329fde47723
 EBUILD GitPython-3.1.2.ebuild 1568 BLAKE2B 5bd129321bc6012432a32586c2c6c13dc96821bc7cb6f322cf7cb03763c06d746d4907e628c9376fcb154d2c45f52a6dd40d61f08372f91d778a8ccbba1ce331 SHA512 4688e66c53578accc218eaa25f4aa2fcbffc4c24782a5dd2a23067e6c60f9bdfb008771aee62f8dd98082766da16b4a71d777307a25aa5378144946d62d0aba8
+EBUILD GitPython-3.1.3.ebuild 1567 BLAKE2B a1d065baf60b83b194cd0d2e7751546e1540de4d49ecf5f941ea19c5864474ea004897c257c2052b2b2ecd6305a34512537976556695d1f238459456d9599b25 SHA512 be6f9cb0d027fa9424fc88661f34f721ce94d706f45d221539a52a398bbba32c274709bd66eab7ba61182d1b8c1f60bb530104e9666cc1ba2bea7bbe54c8f1b2
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a5752e9a5ea7..e9a1529bed00 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 1b56fdd84434..b4c665eec664 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,7 +1,5 @@
-DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
-DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
 DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
-EBUILD PyQt5-sip-4.19.19.ebuild 2147 BLAKE2B cf0e4cc4301306bfc89014714b4eccb4a991cc1f3a8521ca9b02d4ceeb9bad72746c9c56356642ff9846310e95492c68198bf2d91370ac75f52ab8eb65840c0b SHA512 41eb65292ab0649f41181ae333fd62848592ffbf2d88da22bc570e4f3f49f40c4bceb9c5f237fff97bf76397f9438c60acce16ab47d648bd9c2d1df6439cefee
-EBUILD PyQt5-sip-4.19.21.ebuild 2149 BLAKE2B 83b49f3f691236c11425a6ac44d7a103df7984be01f50f6f8063fdd6d6d28db5b977231fd8c7cbde4acd97590f15e658d3d546ffe52002092b053e8c430845b1 SHA512 60ad3994701a0444a41a135b2a001ff53df9597c046be6588ed3f3df0ea95f590766dc2c3e0fb0d4e955b988915259f1d17fd70d1ea484328cf5bc917e25d320
-EBUILD PyQt5-sip-4.19.22.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
+DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
+EBUILD PyQt5-sip-4.19.22.ebuild 2149 BLAKE2B 2041761c23aedb1d17596f59ca891e3289f730e907c1aa46c0e809e98364e2fd8cb34cbaaaffb3c08facfadd37304b6c8b685814316632a8ed5fc15cfc6a0105 SHA512 b023c90e43e30376b95355abbe66df3160995c0bb352db01ced54dfcf264bff486f677c1c28831c8281907b3b9e62c1897adf72dc96d253eac75246cadc8139e
+EBUILD PyQt5-sip-4.19.23.ebuild 2153 BLAKE2B 5d6c9245a3db34b81ac48bfc4662af00413ae10f873ab6754d33afee233e08868daecfe793824182f2b5cb6807605a1417d4c097c18b26c2bb7e1494ce65656a SHA512 3b67f2da95af4cc32c82723c533ad28a163c4be2169a2d9032e04da491e66e2601e887441e46e72fe59e04365576cab95fa1f72941b19949d5907c5a009d67e5
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
deleted file mode 100644
index c381a44d8150..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
index a5b7820e1a9d..a69499758b4f 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
index f6f210bf7330..2c211f51a220 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index a8669171d028..bb19bc694766 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,5 @@
-DIST PyQt5-5.13.2.tar.gz 3162810 BLAKE2B 383aaa3f1f51ed618a3b6475432a96f6a8f89ad4d97197fe87469e0a69e1db79c762965adfacdf92cc43d1bb2eb5e2790f6bdb7e8b288f0feade828bf8e30090 SHA512 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55
-DIST PyQt5-5.14.1.tar.gz 3241571 BLAKE2B c4f6ab8b5c955186c71e0f6c1ac75fc559839c52374e8ce400c823a813c0c646ed60b5f496145114e5480bd2e4c057d52181b81d79fd01fe5dcd9e4c537118ff SHA512 10b6abb6fdac64233041b0ee91c9f25cfd2a759ec5bde239c87ca9df8176cdd4fcabf6deb8db2dd9bbd911a040d5c476744f1b55aded9c66eb8b5182f99ddc86
 DIST PyQt5-5.14.2.tar.gz 3246557 BLAKE2B 0dd57da76dede97349c1af1d97cebad430dd5ae03c99b71de2e1ef1c41c1503820b0c0b1af8ddb507ffa5d6f466f7d3012db2cf625dad949dc4c962fb9e8a6a3 SHA512 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec
-EBUILD PyQt5-5.13.2-r1.ebuild 6103 BLAKE2B 952715cff4114d2540142fceca39a1bc646545f02a8d4e5b5cd1f91d3d54f15b78767b2c845f48d44ae69c077338b3040d529fbe4367b400f1ee53bd9e2c135f SHA512 74ae75f7af17c1f0e81969692a7b7c4d1a70f9e774b8927736d875423a26f7910d83beb24f1bf445c3edaf590d7f4c8e6916ae11d03a53e7227625f606b5fc46
-EBUILD PyQt5-5.14.1-r1.ebuild 6068 BLAKE2B ae3aa0310754a583db2c89bfcfe5515a58104f19921397997449fd237bf53a6b2cfb896c739d8bd7b2fde6d90fb128c6861d2dff4d65807ae8c5fb93761d875f SHA512 b72cd64b609a7e85583cb7a5f43d3f3d25858be69ab9ec09e61edf87b4b348ef020bbd6bc506b9e12dfecb93567b53e3f921ccc1baaed1d7d62fbf3c01e921cd
-EBUILD PyQt5-5.14.2.ebuild 6057 BLAKE2B efdbb9d563d257242092260b60a18884e9b691ad1566f86c7072fa10171e7275d8128d2df95bdce5bc0abdcfea9f93b0f2ddbb7be711fc96d7f9f16dae02a5ee SHA512 f9e73012775f6c0e164591c5b82e82c55486e57adb9dc673aef36621539e542b4d2a6e09b08a14206147d1e6debfa00e9d07d4afe4c8ea4fd473dfcde2abbd0f
+DIST PyQt5-5.15.0.tar.gz 3262004 BLAKE2B 6f9751bb00a8099555da89cc0df26d36906fabaf12eba60d11479152ad78805ba84d6de9c32b6212a19edb38b10c2253976a964bdcfaf18b8b8aa3656126b73f SHA512 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9
+EBUILD PyQt5-5.14.2.ebuild 6055 BLAKE2B 78fe31e1a5f1fdc6a6ac41f20529a4b11adae36219fc59877c95eb535aff360a91d38adff5e05302b8073cb48c7e77c5aba27eb37e7db397e14753c82f400e33 SHA512 513a2652d9a9263bc3af836b3a85ec54bab56e5073b23eb7367cd0d8d4efe79572d94ab90ed212d2c96cb25c5d2a25407c72979105bba80a04ac2ebf78bffc2e
+EBUILD PyQt5-5.15.0.ebuild 6067 BLAKE2B d0cc1bd723d1184fad838bc87931f495bf65b0a246de487fb33827d9a68ac159e7ada3014bd0a12a570d55baf28bd3ee549d7f790fa65b9ec7375ae01fcee3e5 SHA512 9bc5abbe91c29fb6721fbd1c60c2d2076a8fb969490ca2ec6c8099e678ea6687b819e5dea55e7413fce12f69ba3616f383c3a45df148c4a8fe00eb28589ae6d4
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.13.2-r1.ebuild b/dev-python/PyQt5/PyQt5-5.13.2-r1.ebuild
deleted file mode 100644
index 4b62cb093011..000000000000
--- a/dev-python/PyQt5/PyQt5-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia
-	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
-	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.10:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.19:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-	' -2)
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.19[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		if python_is_python3; then
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-				${PN}.pro || die
-		else
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
-				${PN}.pro || die
-		fi
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.14.2.ebuild b/dev-python/PyQt5/PyQt5-5.14.2.ebuild
index 94bbc2a6c2c0..04c639a05ba6 100644
--- a/dev-python/PyQt5/PyQt5-5.14.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.14.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQt5/PyQt5-5.14.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.0.ebuild
index d8ef5f3a330b..3d51e939103e 100644
--- a/dev-python/PyQt5/PyQt5-5.14.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -18,12 +18,12 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia
-	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
-	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
+	multimedia network networkauth opengl positioning printsupport sensors serialport
+	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
 
 # The requirements below were extracted from configure.py
 # and from the output of 'grep -r "%Import " "${S}"/sip'
@@ -52,16 +52,16 @@ REQUIRED_USE="
 "
 
 # Minimal supported version of Qt.
-QT_PV="5.10:5"
+QT_PV="5.12:5"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
 	$(python_gen_cond_dep '
 		dev-python/enum34[${PYTHON_USEDEP}]
 	' -2)
+	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
 	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
 	dbus? (
 		dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -91,7 +91,7 @@ RDEPEND="
 	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
 	dbus? ( virtual/pkgconfig )
 "
 
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index d75d47e369d2..d8b322c6a3c7 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
-DIST PyQtWebEngine-5.13.2.tar.gz 45234 BLAKE2B 4ad3aa63856cf3627c2f4ba29d93394f13297deb5e54bdd200bd419f71322d541ae72e45d70cff09cc53808f0d2430f8922d44f18bbf177c42a6b9c827854d6e SHA512 778aff78ea731230029e8dd993f4bc59a32bf74d65f06a8b3d1467efdc67e3b3caf0d9a968682c6c275c8ffdb8d85d9c756cb51727769949656620e944c736d3
 DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
-EBUILD PyQtWebEngine-5.13.2.ebuild 1715 BLAKE2B 77f1aa6f47e1efccc83c0524b7c36e9f0224e5510bf1a4df5d09f22a8a87693eec6902a74ab5dc9b8861e525f0b73bb22b3fb6aa425cc01712d2072e5862dff5 SHA512 26dfa18c651fd149342e97ce5db71e8b60a3d59526dc2a608f634da99890c9737098bd0dce1f60546c4a0bf0b9b442acbab00644a9e9b9f166aa67057f52639c
-EBUILD PyQtWebEngine-5.14.0.ebuild 1679 BLAKE2B 733195892c0094fd8103c05adaecec2a72b99024f81e8a54b350b846c8208d75199f595fedae308f3ef5eeee1438af03bc985bb4f20001b1b739764fe0d8124d SHA512 679ae17740b631925d8e7b3db64d8fa5d33febf4e73d8065cf20b1a3e777323f754629b7e9247c0943b3f1a3705a8c6e815b60c3a784428c9aaa4ca6b733b24b
+DIST PyQtWebEngine-5.15.0.tar.gz 48308 BLAKE2B 18a0b83c245a738f144cb21ddc483646099dc6469b0ecfe634d0341c555db17724cb97901082d2d93668a9e64b9163496afba8d7928f8e49013bcdcdb3747105 SHA512 9bc74e4c7c49a42a5a1a75c75cf14d30e7e9202b6f98591d79dd7f47d44909a1c95a1b38cd47adc8182429c43d1d45d90b2c3d0f105b90ed7ebfbb33a2622322
+EBUILD PyQtWebEngine-5.14.0.ebuild 1676 BLAKE2B 2efe92296137c658c62d9300062e6b649c9be91b4a3dc1633d8b4b4ddfa65c34fec81bea0aede6db1182a86a9cae1931366277ca2262cfade1c3c159aaba817d SHA512 876c06b3f50d75cacc473109d5c859f99070606cb6e5ad9322d02704e9a0e6057876498cf979d84834e45d1043795a6c90a4e819b87db6a11392c11a7069cb0d
+EBUILD PyQtWebEngine-5.15.0.ebuild 1678 BLAKE2B 3df1591f025cccc318c3e012a9ce546a3875fb23329a3b812028a0f7b5a692c6390ca5bce82a12a3f1bcac464b7eae1d8a5e14d8c2e0f27752df00e808a271ea SHA512 a5cd1bb633b3fdaabcc4e6754e9f78ca8f81b77c55aca410d436207483c52766b0415a1486921ebffe934a5acf5b1037a4fb2360ba8c16e43ed469d3720ef633
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
index 20a3bd97ba2d..7846273daf9f 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
@@ -28,12 +28,12 @@ REQUIRED_USE="
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtwebengine:5[widgets]
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
+	~dev-python/sip-4.19.22[${PYTHON_USEDEP}]
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.0.ebuild
index 273eb83ef2ed..4d322572d51e 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
@@ -13,12 +13,12 @@ MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug"
 
 REQUIRED_USE="
@@ -27,13 +27,13 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtwebengine:5[widgets]
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 439b08e75af9..c37aec9c3090 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,3 @@
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
-EBUILD QtPy-1.9.0-r2.ebuild 924 BLAKE2B ab22f1e09bbd7d0dc0ed95602c82424a32025cd3e270fd112148ebef16693087e529aaa4bff260a94c5505f0c5d35069b5a8d5d34c246ad843d014ad052624d1 SHA512 ad9341a7d81042ade7da84c9dd8e2463bba479236806ae23c8bd5166ca2d6824a2cbc68fd88c098430c10f05d917841131e4781b700f38e00b97997924800000
+EBUILD QtPy-1.9.0-r2.ebuild 930 BLAKE2B 306d95e8d642e1e3b1443710b84e2875150b758e5633e318a185967a275d23d9877d64bb72c528c392843ccea7b22283788627ee3ca944f22965ec07997afd2c SHA512 2b2af09b75fbe7e9809dada369d690624294ae205dbee2492e375cef80a73fe8754a3b80806610f6550cb27f998944e8292bbbb19c5b6d373789967dbe510838
 MISC metadata.xml 1268 BLAKE2B 6efd4418ad56825334d01ac1a8fdc56697dbc80f8d5e915b73b366b3bb7f8d9d1f8ae664e666d19f0088ab05de8454335ee940fbc9e58a32e65a025378744602 SHA512 968f8cd0f4dfcb3217d100f88d41ec3f3301dc70c1f2648698967783161d2f7cfa816edb6dcc5f83aceda6693fb92bdf0d4a2acde7ad00c3ebc5bd8146b51b42
diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index d4497c544268..ea4bf2866229 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="designer gui opengl svg testlib webengine"
 
 RDEPEND="
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
index 26c5f45787d6..19e9923aacf3 100644
--- a/dev-python/Rx/Manifest
+++ b/dev-python/Rx/Manifest
@@ -1,3 +1,5 @@
 DIST Rx-1.6.1.tar.gz 89543 BLAKE2B ee0b6c30c794febdd045231ff61a330a512c86a9dd3c56a6afa900c31ca774725d7bf5b589d46b60f79cd1f0bc967b5ab5bc87a58f6d3dbebbdb1b6618db875d SHA512 8602b5175c058e855ac4b67d8feed435f93632da2f4033fe0db54fcbb012a702786b29f97fe3fd641f054c3a61478dccac21c614b5708f7bfb0b986c9951e6a9
+DIST Rx-3.1.0.tar.gz 890293 BLAKE2B 268f6df5450d1235d50f9aee5cd43fe6e229acf7b2ddab5f1f97e80594aeff7beaa280fe272ac9cc8b80dc6874f4bb76e438e94c09712f2c37e72d8d40f9f283 SHA512 1d9f6639ef08dc991326b95fcbf0978adea55b35acab653fc16bd94ccf2ad3a1515e8cb4e8d2ff38d7a506306e310394339a8651a2a02fa22bfb7f17d86297f1
 EBUILD Rx-1.6.1.ebuild 347 BLAKE2B 8e84f4c7daa13436e5c9ecb3deb22f41e37ba448f1c830836f931d08c0e7852c8a70e19ea56ae0baefe9188d0541eb3f69f072843e8956310c1639fac6d1cbbf SHA512 9355868035c59f3c253f3c580a357dcb08fab50778b17defa0aff712879be908eac6d2c2d50f801586aa2429ba23ee7cfbba95fbf920b89c491e1522b019f368
+EBUILD Rx-3.1.0.ebuild 605 BLAKE2B bfebdb964ca3a47f98a54bd5a4d9190c58e89631a423da327f974b5eea94450fab0e0c8bf87ee0ef05a9dfaa86496e9ebc60baabe0e2f1d27d3c68e120e75fe0 SHA512 34ae9fcdc055fa742ebe7157523bceb38a76ea155337639166da2fab4d5e49d52deca5acf85f3361d23e2a3457e4342b50d24423d1d8dc05ca359809749a77bb
 MISC metadata.xml 327 BLAKE2B c9349fc7bf783920d0f8469ea19b8cf475c4705d3499364ab79a6960e19c3458b7d2a18aa90a470b033003fe461f06d34d25206b702c835e5a311d698d4c2e95 SHA512 382a7e9dd6cf734155229b3acc48060b4d11f2e68b2fe906ad8508ea5de95b1adcd5d23d58b6ff4881f7d5c9f103e64b60787eaebbeff2db8f9b24188dab6395
diff --git a/dev-python/Rx/Rx-3.1.0.ebuild b/dev-python/Rx/Rx-3.1.0.ebuild
new file mode 100644
index 000000000000..dca57f5969d9
--- /dev/null
+++ b/dev-python/Rx/Rx-3.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 python3_9 )
+
+inherit distutils-r1 virtualx
+
+MY_P="RxPY"
+DESCRIPTION="Reactive Extensions for Python"
+HOMEPAGE="http://reactivex.io/"
+SRC_URI="https://github.com/ReactiveX/${MY_P}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index 3ca05be24e74..d1e3d6a7a274 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,3 +1,3 @@
 DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
-EBUILD aiodns-2.0.0-r1.ebuild 824 BLAKE2B 8c24dd47e423d56d31280a51449297ee0eeb65364b38576a1a488c00e2af5de883c9f55d149ed6d518356174f0077e050c152ab770035e43eb41e46547179940 SHA512 e0c5f9d2ef95a95a8ed7aaabe9a9e73afde37e9a7cc08436ddb46dcd5f597944b3faa3c07d8d4fa946703d63db55d4af03143b88df752cb0d3643171eec9c7c5
+EBUILD aiodns-2.0.0-r1.ebuild 831 BLAKE2B 2388f981fcbd95c3554f30c5ad4718dbd0ebc60c6f662a1906a4737cce3330c8a57236356ddcc20cb70a9b008e374d0830143cc4c56cd666f269df0533c5d60b SHA512 43fd2e1dd0232fd092fd4c944aeb38bf7b85ef3f1a51d7d1f9820286718e89237a3cf185c4d7ad27990fcd6a9ba43810159adc978c095b29b13e7e61a720020e
 MISC metadata.xml 340 BLAKE2B e607777274ea754605542b7ade5ba3d118ff366ae3bc57f586031450dd54e43189e0e1b3fd8305e351380bda96289e0cd95e074fdebaa7816da757329203775f SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3
diff --git a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
index 60100a71a0da..8553565e66da 100644
--- a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
+++ b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 # Tests fail with network-sandbox, since they try to resolve google.com
 RESTRICT="test"
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index dacbeedb0cf1..6e797c2d1f17 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-3.6.1.tar.gz 1113678 BLAKE2B cfdf1c650ec52c7b6423f7afd40060ccd1631a407f126bf64c2a353c51f09c31bae3912b8ce9397c0c8350a2e82a98724ae58335998d1ab08ae46a49abce0251 SHA512 4939b89d45abcd655ef212ff87f66a83882fb12dffb87d62ae57afcd9517725af61f46f9b7428112e2dcd72d3a4027524967461270ede34348ff3ead47d14c9b
 DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
 EBUILD aiohttp-3.6.1.ebuild 2179 BLAKE2B 956ae3f0a7439a67cda6bf44834fa28f5e2db93725fed02f4841f207f7dc3eac68e4a81a78df42e2f5cfebe53dbe1dc10d1012962e57fe8961dc4df985310e1a SHA512 c1e631f18adf1e21a4a901bb6074aee8dc4635a6cae6f2d74ec6e8a00e3f08d9bd494d92c85f3699035e6ed322c709a5f8e3ea2161c0447b3412b9f1e527b74d
-EBUILD aiohttp-3.6.2.ebuild 6174 BLAKE2B 12e6dc789736d88d28572609fc79f83488fe504a063b2ee0ab6007669d8eb2cb11416831340cb792a7f8db107c86360972c861fa4ad3540c37f24116a8bfef80 SHA512 603fa87993a484de17227f51aeb198199fcf0c8e5d202560da67dbd79ad76472ee200e83a4968a1aafa998285a2c756a90d9d8c2b16278020b31ebfd9799ddf2
+EBUILD aiohttp-3.6.2.ebuild 6359 BLAKE2B 36dd3377a17cef08b98cf1b8db6e9e9d2dfb13c31dfbdc7728efc4db797fada894b036b064a328a4c3c12e44b431de347b040265188bb83891e9abbb3c71acdd SHA512 89559ca6aef2a70245bf0bbf3b6132bea7355def36e36a1025a24a84ebed1dc685de3f2a89b44a478e8e72d0518cc96b1fba87ad12a9fd5bc0c34782269edd5e
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
index fe8ce0270cf6..cd2cfb9da4fe 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -124,6 +124,12 @@ python_prepare_all() {
 	sed -e 's|^async def test_partially_applied_handler(|@pytest.mark.xfail\n\0|' \
 		-i tests/test_web_urldispatcher.py || die
 
+	# minor breakages on py3.9
+	sed -e 's:test_iface:_&:' \
+		-i tests/test_frozenlist.py || die
+	sed -e 's:test_proxy_https_bad_response:_&:' \
+		-i tests/test_proxy_functional.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index e96fe8a6a065..66cccf5f8c19 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,3 +1,3 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-EBUILD alabaster-0.7.12.ebuild 499 BLAKE2B 30367700cf1954a64866ce01d77b03732f72bb15e602d5981d0d8444dec4ef522ddfbd8d6c096c35b6ae3f821547d0a9cd8b1c6fb3a34a013b4917490d42a462 SHA512 8222b25325d42359233717e233004bdf10837403513fffa7ea10a4f908182264ea9c52fe8e3163bdba9163246758cd2eadd7c88d5092acb30568ca584edae65d
+EBUILD alabaster-0.7.12.ebuild 498 BLAKE2B 59da5e0a5dd9f35b1391503407de56f2da9b25ff32d52a82bc3b5ee957fc7abbbd3c29106861956f59cc49e347c4973f7aab8d0c9d8f804bc9323e0ecbed15a8 SHA512 19012152550039a37ad3d5be8c43024dd689b07e239b5b821d1e8e1fd7ad96481ba5e5df61e9273116c440cf84c350556bb0502f50ec72209f111e328381886b
 MISC metadata.xml 409 BLAKE2B ba8f679d608b3fea7dc109f7699830f487ec02644cec6af7dedd8fbd5246062f85b92a94646d30470e7b502eae997a0abf0f92c6427b1b9ffd264e83035b1217 SHA512 0dfaf8004d8f6f8b61e8bf94e12bb083ce4b7e3f850ecbacc6d82a411e840389317337eb7442c6f5848d2b928aef59c6e56b916b44dcb8e3ef6945cd7695f3b5
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index 6600e25d82f8..f4bf497e0911 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index bd004fa37727..8537ffccde79 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,5 @@
 DIST alembic-1.0.8.tar.gz 1030713 BLAKE2B 67cb80ed064e99f27e41a7ae2e42231794c177f96b95e2c3409a0ebc26e5323665147b2721efcc4a4d8ee2a71ada76408187f39ff5ad3745de64ed31f87d2895 SHA512 7a2ab63c6a823a32f45cd8ff5b763671806a8fa3d2b31e09c2051bdf92784fdafea1e3be217d84885d92eaf550e223ef77fd6fd387d35a5882d60ebcf042d835
 DIST alembic-1.4.2.tar.gz 1092045 BLAKE2B 5f4001a756aacbb4db509669bc0d4d7c59c38e2983c433283243efa97bf28a22e38bcfd28a4bc72573e8ab78d6590e78f4e12a5b9dd08b60cf5a84520b955056 SHA512 82bdfe442c19033aa2b802ec49edd13ed265c00a2b5a048490a83ffa8e53587c56a90b64d554e746a9189923419c528482cb7a7c950c210e0de47b32fa7c270e
 EBUILD alembic-1.0.8.ebuild 1412 BLAKE2B e8dc987cb0e1ec70a454d43828c8bd4c15d028fd6d63dd4ca6f8ab15f11b5b208b2b90d867ce95843c9dcad4b5e0d82b954c4d73e80a07e56c8dab68ec00e03c SHA512 7346c12c90fc7617de8d0c015e77f9856975b0d127c11eda15ac63732f07986d4c3030db37c3420e2caefcd7dfa831b3d5b2e6e0259caef046b565c88308f460
-EBUILD alembic-1.4.2.ebuild 1193 BLAKE2B 09b8a41c364c3316565aa3277bef4757c499a4c78f458185f180bf778d99af285808c131cefcb3159d99e865aa282d56b5a24365eb63f20678306f44fa6fba28 SHA512 effb78f58b1fa436e6af265d1437c4aed60842d9a40784fd31e8b4094daaf164ecd468e7d15677dd4c4c2396f85e26a58cc8302e46071c3043a95f56472ac01e
+EBUILD alembic-1.4.2.ebuild 1191 BLAKE2B 9f76369659af2bb4e6fa26e2016aa689f0f33e2e24f7bd1ef2983f577c8615010231d6c5c1ae53d1c2e43b889022bb1c18f782ca0b7a1e750c02f2f36097cd29 SHA512 ea7ffcca42d4863e24a5300c3b84068c8dfeff2f6805dc7d062a33d90a71657f54f6a4fa7aa4bfc15b98a2202091f012bb33084c13404631a066c0cf81c9b21e
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-1.4.2.ebuild b/dev-python/alembic/alembic-1.4.2.ebuild
index 500a91574ec7..581f85706873 100644
--- a/dev-python/alembic/alembic-1.4.2.ebuild
+++ b/dev-python/alembic/alembic-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 6994d5aa1913..04202bc7dcc5 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -2,6 +2,6 @@ AUX argcomplete-1.11.1-fish-xpass.patch 1195 BLAKE2B 9ae2e5803359f2abca0b168e009
 DIST argcomplete-1.11.0.tar.gz 50555 BLAKE2B 7029b2bf442362f3dca804b75c32e000bf48e1ccee1e8e4e0e3c484d883a95f4c4774f7367b51f6310b653be457f3ad1ee5e4907cf9566c97a12ca85fbcb177d SHA512 30a594d7f3a9ad31b4a7c537bd81e6cc23bcb3861a9d2b9999c654c0f04b4f330bcb7dbab7fe7191d4b8bbbbecdb2ad3c1b8ab812c16bec880fe83733f75c5b6
 DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
 EBUILD argcomplete-1.11.0.ebuild 836 BLAKE2B 659835d8d5bd7656717849047d09a67b45b203159873a800ee38d0779d5852d965389a040f50d281559fcfeedf1a5fc554ea138bb61cc8586c34a77e68333a97 SHA512 f882eb57a2c9e4b7008f40ecf1cb0a354f36cbbd8f59a786036539dc75f288335ad83fd51011dc48daa134c7c3a18c4bfbd9b17bc1ad5309bcb480d79d1be8d8
-EBUILD argcomplete-1.11.1-r1.ebuild 891 BLAKE2B 8014c96db417f6e6b7c807f015add3b8495a6a896627e0ea03c5237b537102fdcd81c3954358422d3dc6c6ae5b7982e4d7d58af36e4a5b390e36d6d0e1e13ecd SHA512 ce17edf9e2805815be9ee90003a44efcd638d3a5d139d2552ab0ce2733c503c5372da9544fbb129809004f4ce1e46e9c12b29505f7a8351e41aefec5b2f94762
+EBUILD argcomplete-1.11.1-r1.ebuild 902 BLAKE2B c1ecabc8fa7fbca9cf59cb06bf913a314571e3c8eb94cac97f71bba31e98eb8c81b5d9f7873b66ff296d3966969b4628a89fad4d0278e1d378c21821fadb32dc SHA512 af4701ce5d4dd8d5898bc9cf4f72205633ffca1ea7ae33cd49e8186b7b63e419ac7bb872223b8f31f41d505d1c0e339680e1beb3c011c139c0f37d15b7b183b9
 EBUILD argcomplete-1.11.1.ebuild 877 BLAKE2B 1447f620cf4b54262454de2f128b3e74e82b41b805ae4f50656c314d02030b868c6b02d70facc2f7e0de5304a94e8cf892abfb4dd84621bc1bb443b0eaae94cc SHA512 bb33d42173aedcc74bdb8ee41c144b22e7214dc71e10c42a66ec6f23c4e5e176387c449cb1e3d3093e166f0766eca6c5836be6e609e6255a5212bbf7fa90b483
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index ee1477928113..fce733275ff1 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 53462077bd33..a2404ff646ed 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,3 +1,3 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r2.ebuild 678 BLAKE2B 6509b3206db11bf7761cd6bbc37d276b6f567d41c7238260487fece087a9c0ebb16ff457a597013e6c1b3a349a7599657a52bb400fd90526d7ec68d94785dd05 SHA512 390fd4e57d0bba14dd6cf411561e4d9f169340c172c61f415066c7199e2ad8420127e0f0c7c63d8e8f2671a54499180b44e4411d826ce01a717316bc06d21256
+EBUILD argh-0.26.2-r2.ebuild 498 BLAKE2B f6b191cd839b97b72e7d454bd25ef1125e917759c9795b8c8cc6f74682731bb6ad857e729f074e63a34f445d29563ea7b2cdae8058e586479dc9e0252c30ec47 SHA512 ad005475bbc3810ed54c79a8bd3dae0502b7b2ab5d2251638e76c64616948594cd3cbcbb0dd743be5e279d89d6fd21fd8360ae16b5a5e03946235e45306d9bf2
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index e4fc72244a2f..7275fa021aaa 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,18 +14,11 @@ SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 LICENSE="LGPL-3"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/iocapture[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		${RDEPEND}
 	)"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
new file mode 100644
index 000000000000..0f8744fcb7ee
--- /dev/null
+++ b/dev-python/argparse-manpage/Manifest
@@ -0,0 +1,3 @@
+DIST argparse-manpage-1.4.tar.gz 33661 BLAKE2B b2f6a0bb7ef3a95470e73c4c94b9fef42f130433d5f91263201d98c0afebd4c3fc38153a172aa86c50a773e3270e1f618083f968bd38a86046362367f2e8c022 SHA512 4756781dbe988541cb0e1fd8a79c4d262c7bf54397fb302ff3ad706e9a896d68f781931e73013cdd7136efc6e46914118b862e0377f49b73fb25b20d0a23744d
+EBUILD argparse-manpage-1.4.ebuild 532 BLAKE2B 5124686a176d874ccf1b792f613d469b0d685dabbf845a1938821c79f07a9d19e43b34316309d96b02c40ed94568ca2d67611fea743f6ab0c960d49bb7127dbf SHA512 a4953bbd2bf61f4089b8c51fa83f67bb40e0553ccdecda32235c7af36785164c32848c6d1b60ab21ecfff02e90247ddd3a8acdcaa6e02dfc5abeb13d64206119
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-python/argparse-manpage/argparse-manpage-1.4.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.4.ebuild
new file mode 100644
index 000000000000..ad772920204b
--- /dev/null
+++ b/dev-python/argparse-manpage/argparse-manpage-1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Automatically build man-pages for your Python project"
+HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
+SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/parsley/metadata.xml b/dev-python/argparse-manpage/metadata.xml
index 8879b60cfbe2..cee379b15409 100644
--- a/dev-python/parsley/metadata.xml
+++ b/dev-python/argparse-manpage/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">python-parsley/parsley</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index f75e57e78be2..26bc5d2abfcc 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1,3 @@
 DIST asgiref-3.2.7.tar.gz 25350 BLAKE2B a92d573330b1d10ba9c8d963c0824bce93151f0e38533f81a292ec0b98bc218e3b214e44ed1dadcaf10b94e94fd626cea00a5da40c5dc129b7f40ca2c5afa432 SHA512 a7b8b94e14299ced539c7ca60d310bbbde2af0f40bfa404d176a95bb6cd37402bf6bef5a5a309cdcdda4852908717a83763d7deb520b05ce74977a3bca4621e9
-EBUILD asgiref-3.2.7.ebuild 546 BLAKE2B 84382a3ff9f14d50ee786bada11e35cda3fc14c0d701dcf0a895867f8aadec8e028c743571ebfca574cc17bc76ddb6d98dfea15812346d295a7087b962c6905f SHA512 ff0574b0ec1bcf6093999e853957f914ce89111f5ab3951167df0c2014264fb5a171350a2a8107cc1e17d59343d19e7c219e479ec2a1603bc88adc8f782806ed
+EBUILD asgiref-3.2.7.ebuild 551 BLAKE2B 940603a6fca7eb90892cc81c038d128f9959060fc073647bb7edd94fd64d58751ba3c71e714da2fa1a6f7f17e27f0c4a4689f40af5963d7608baa24587d2e266 SHA512 c1c490b01a23328484e6a416aa5314f48bba151b52064e79e16ef1efc902d6b6e18df7a687c0319c6bc61042c77c8219e7d3bf7abeea308f5496d20c32988033
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/asgiref/asgiref-3.2.7.ebuild b/dev-python/asgiref/asgiref-3.2.7.ebuild
index e6d259f88a45..520ccd29acf5 100644
--- a/dev-python/asgiref/asgiref-3.2.7.ebuild
+++ b/dev-python/asgiref/asgiref-3.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
new file mode 100644
index 000000000000..dede92d6ee52
--- /dev/null
+++ b/dev-python/asteval/Manifest
@@ -0,0 +1,3 @@
+DIST asteval-0.9.18.tar.gz 52727 BLAKE2B 41b4093ee58dbb5fca0ab0ef3617e8211d2a21a968f448efd562ca53daea06c4ddae7fc93ba17bfeac501cb46c5d061148b10f33340e93d292559312f974644c SHA512 810fa9bc82df18bb92bdd487cd4cfc0a7c63adf5d4c7edac7ad7be0ba8e40605314a3453b4af06faf59821902a783bab3452adfe5c7ae54b69bd62b3126d3c3e
+EBUILD asteval-0.9.18.ebuild 445 BLAKE2B 8141ccc6791e9458ad4fde82d88b2610f4e9683fcc4c25a2cba8ff3fc0b62176f9d055c7815e1f3d18465cb3a90f3cbbf46b7a41796ebfc0a142d853c5e445d9 SHA512 c4a62670db94a9b8ded540c997230b004173d49ade8612160316245c4a8cf6729432830162b4dbd7d838cf0d00f35de046a447eee1d96643e43ec5cfddad8726
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/dev-python/asteval/asteval-0.9.18.ebuild b/dev-python/asteval/asteval-0.9.18.ebuild
new file mode 100644
index 000000000000..1cfe0bcc549b
--- /dev/null
+++ b/dev-python/asteval/asteval-0.9.18.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+inherit distutils-r1
+
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-djvulibre/metadata.xml b/dev-python/asteval/metadata.xml
index 3383b6ee4748..020b40648ee8 100644
--- a/dev-python/python-djvulibre/metadata.xml
+++ b/dev-python/asteval/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">python-djvulibre</remote-id>
-	</upstream>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 03f5f6eab12d..d71fdd79508f 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 699 BLAKE2B 302d7e6d3fb7ff74a9a83e4857187744e35c1df52384b63809218ea62d49ae53c0298c2213cd12edec72360aa68344dd3444e4a42fc88168dbae8f3773c9469f SHA512 4d6bf52c889f1d9abdb58016bec16b4b60fb19a896dbeaa63fd18b575156a07b6bf31056d8910da00b45e76d8be6aab700abdec8eef0ade6f633d9169116a238
+EBUILD async_generator-1.10.ebuild 528 BLAKE2B 235da3565cdee54b50a54072bd10297db9f2b30d6b968d6b8610e8fbd0652f086ca5c91c7d4b39ea4b0175d46af3518b8aa21665d6aa33785b06f9e562019ce9 SHA512 aca4682a1f657c18007a85f7350d042170e17dc9f48a01c8da8a70ce6636f101492c3581586f0cd2b702664c26be7086df8c44dd9dcd21c52454bb764570a2ad
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index d12667b57c3d..51b8ddbb5188 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,15 +13,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DOCS=( README.rst )
 
-python_test() {
-	pytest -vv || die "tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 59ba3a410f09..12914ac0db12 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 973 BLAKE2B 87a36586680da426991a6d74a3e54061fafdcad6cbb63a2092faed781f327f4deb339f76b8bf7ccbab3aef55c0b0d973ee22f919579a589ad092271267d06da4 SHA512 494b5e6b6f4fd005ad1fd983598f2e15db45e475364426efa9559533ab6d5d8882a7d894856f1e8c6758baaeaeb25106f895a0af20e4e0fc6ea5ebbea3761d37
+EBUILD async_timeout-3.0.1.ebuild 972 BLAKE2B 2c723eb4dd78ed0881e9fe1055ea51d493a3d2fd293bc092beae039339e88d4cb2b85ae9b58d4c59731e426da75152628cc18fe03771029df1ec6022f1974437 SHA512 7b60172aaa52304d5c7e2ddad5a7767d469051b83f4bb92aff5f50a9c7b5d24b3dca2f230edaa77a575b9f3aa1de4896f6c2082e71fb7611e8c90a868b459e41
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index 782e942a433c..b0788bc692f7 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/asynctest/Manifest b/dev-python/asynctest/Manifest
deleted file mode 100644
index 536aea78d83d..000000000000
--- a/dev-python/asynctest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST asynctest-0.12.2.tar.gz 49647 BLAKE2B 40bb5212409b2f0d9efce5c2559ffeea081c41b3f5158874d9a733f6f5dd2e6a2d7acf3eb495d91c1bc94e785dfd67c9bf5d1845e6fe40ad72aa36ea548b15b9 SHA512 e182fcf0c42d726dde810b9e2d50492b9e5ec9209b5419bd5faef28ee475ff04d6c8220bc165ec506eb9fc2dd38e45d7c3f8bc4ba1f0e279e44214e39862fe0f
-EBUILD asynctest-0.12.2.ebuild 780 BLAKE2B 206bde7222d02275eee695f2eb40ff8015dea811f689bb8ad9ca1bbd5e18ee9642f19c63aa1a17fb2058e822e9153a61dfb9a9fa9f3609887a32b04d6b2d347e SHA512 44f24c22627e0b1a06613105bb8de4ceaefa14cb130e20f05021ad1e84f57e1e440457ca594102848efa6568807d1b8155062adfbabff2968e39fa87e331243b
-MISC metadata.xml 378 BLAKE2B 72851891ed44bd1cbc3d6357acc38c9ca6cb43dbf340b852cde4e0a7b5dc314267f78dcd0686d38d5f92a117eba15f46d3376ef6861e9d23c6a66b5feb38931d SHA512 71210e4eccc1cd84318eec019f33eeef6cb6b8c155dadff99bb76001aee6d54de3b82df56aa2425572400aaf210d21a59ade8bc156812c56f8a5a3742460f292
diff --git a/dev-python/asynctest/asynctest-0.12.2.ebuild b/dev-python/asynctest/asynctest-0.12.2.ebuild
deleted file mode 100644
index 92996edd1fe1..000000000000
--- a/dev-python/asynctest/asynctest-0.12.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Enhance the standard unittest with features for testing asyncio libraries"
-HOMEPAGE="https://github.com/Martiusweb/asynctest/ https://pypi.org/project/asynctest/"
-SRC_URI="https://github.com/Martiusweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	default
-
-	sed -i "{s/test_events_watched_outside_test_are_ignored/_&/}" "test/test_selector.py" || die "Could not disable the failing test."
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -v test || die "Testing failed"
-}
diff --git a/dev-python/asynctest/metadata.xml b/dev-python/asynctest/metadata.xml
deleted file mode 100644
index 32fcb20ec76a..000000000000
--- a/dev-python/asynctest/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">Martiusweb/asynctest</remote-id>
-		<doc>http://asynctest.readthedocs.org/en/latest/</doc>
-		<bugs-to>https://github.com/Martiusweb/asynctest/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 3993a1a6aca7..db0f7b7495e8 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,5 +1,5 @@
 DIST authres-0.800.tar.gz 19863 BLAKE2B 01f9264a78ef5a3ee9fa1db17dd4fc5d1e849a5f297f610ab0bda09f4900bca15e63d71c2312e12b1e6173213d3eef938dae996c7bcc599de496b6c77001de87 SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7
 DIST authres-1.2.0.tar.gz 23226 BLAKE2B ecae8e08a72cfca48a8264ae8d93bc29a8a7afc080a120b08380fe29be1ac50bb68a74e6741dbf7ada2f9eb901d2da0b1567e8aa10b7a82ba4953cd32cc94f57 SHA512 b801b24127f90608c4e7870a3a15bfb6e350f7d8bbe7b7cd9e1c6d541fd360afb9bdd15f35e864f01f8ff2d33d65650e712c932c9402ab2affb86bc7536b63e1
 EBUILD authres-0.800.ebuild 586 BLAKE2B 59c53928f8d774278ee5fdac8fd50b9502520d1b7dd7591bc0ec76860b81084984de9ebbdfd1b23387addd46b87b9f3426e16118dfd1084c2ce090f323478fff SHA512 e343e23a9db914d2226e25fdbe562475379c754c74b51c29e483969bb9c157d9d726026e9deefd31a24c76ee884e7f65b975350cafad6fcf63d12c1b1029187d
-EBUILD authres-1.2.0.ebuild 559 BLAKE2B 86cad530c928f339c51efa9306d535f338831ad8eb72ab19e58628a5c241a693590b6608f18d9927d1a7795ad05f661d03fbf826342e24e4b866419d2e3f573c SHA512 2ef4f47c583b72735cb840a5920196131a8ccf82a5a5959a385c1de1b9c8928396f5a1976091944a738b51241c988a88e22cb98c4f0a2884070a7ed9e165150f
+EBUILD authres-1.2.0.ebuild 554 BLAKE2B 85c03e35678f65729664d0d6f91c17ff9c8fa5bf6b37c6c49d7454aa02b23a246c8a60cec8dd5bcd171da921ed135b7c30546ee1c5dd2e80e8bf38c74811c178 SHA512 22828246cc668554a20f46badcecb1faeb942c931893d9d6d664c2a5bde380c50b76ef8248770999bfe1d74e582a5778f7ef4b923728305ac1eee67876c24a4c
 MISC metadata.xml 659 BLAKE2B 96a0bbbd3a801f527d61237bf4de6b1140cdbb316571efbf4934a0398b6f171ea04bb9c80eca90809ba00eb4b8a2bf9806442752d58e5fc2b43e5c7438425762 SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d
diff --git a/dev-python/authres/authres-1.2.0.ebuild b/dev-python/authres/authres-1.2.0.ebuild
index ebb3dc4e9691..ae527433ce74 100644
--- a/dev-python/authres/authres-1.2.0.ebuild
+++ b/dev-python/authres/authres-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 19e5a7eabfef..8d654c20d92e 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -4,5 +4,5 @@ DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339d
 DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
 EBUILD autobahn-17.5.1-r2.ebuild 1746 BLAKE2B 58518e8cd04b6c01710a01d8b269496ce0c08b7fa9513e3f7f767e6012b3bf8d65dda993ce68e65f0c1ea17ba75bda36b11770a35e8d84241c7b0f80c5c0336d SHA512 6b5d81c6a25161d515acb187d1cc319399e81886af2806074d40e3c626ed4f51681d16b4ed9478ae941ebc4e028bb3fafe3fb9974398fb0ae81553307302ef82
 EBUILD autobahn-18.3.1.ebuild 2112 BLAKE2B 35fb84e5a25f80ea08dc8994d940b19ae9758bf1120b2b70d2bc2280e1b29efa6a1f3a8d01917c27d593a7e602ebbc64af236f05b9e279d5820e3d965c414fd2 SHA512 2ce04471413d1252d58cf43e80d65be5c2d0b3049426b0863387d624762b5a9fc1060d8d9a7d657d1d4e9b54dd6a16174ab5e40c4e7962158958e57270152bf3
-EBUILD autobahn-20.4.3.ebuild 2425 BLAKE2B 75f41cd47cf8c44148ae1f5adea4a18a9c40d45b8281758cf284dca29823ab5bd47ee0e484f3e3595623155aab6416dc0e7f546ba908b09d40bdada1c4695a3f SHA512 ff667f92a78e4921e4b2de982d9d4902f582d65666d23b56e9a9339c468508c31236c3dd379fc70ff4ec64f783b8f89efef4d35fb0dec89ee5d102326a99957a
+EBUILD autobahn-20.4.3.ebuild 2437 BLAKE2B b3c6a2728146163423cd42ba36c7b01c8045bad291e74201ef8ef1fb5a39b811ff38bea73c9107da40af5ad8fb36a8d0e4d3d606e5167617192f17df8bba60a6 SHA512 067080cb643272e9ea8626bc0d4c3e9415ae730b8162f1f9efcdc95318ab84f957900cb263d0dcfd1befd3ea9bd9db98a68c330551bf0bc378f6e2c455051076
 MISC metadata.xml 397 BLAKE2B 2953764a2489f28c0ac996cc8ddb805720cd037ab685d342421b9f735eca7a794c830d551159c4a58e8c22c2101dd7180b298d3b28dd936f651834b9bf3a1838 SHA512 730d7bf2c742cba64c8d64117c928d4712efb46b87b71dfc9195f0a014c26c778c653ddf1386b3e274ed556c30c28347ce4502b0fc2447fc8c51b0a65941bc00
diff --git a/dev-python/autobahn/autobahn-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
index 396e8da241b2..e3bfba3353da 100644
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ b/dev-python/autobahn/autobahn-20.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="crypt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index a49c2a6a223f..9c4cf38fdf4d 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,6 +1,7 @@
 AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
+AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-0.8.0.tar.gz 59687 BLAKE2B 56e4ec76564d321ca9a709c484077a4003eea2842160e226728aaaa4ec6ebc2486482f79cd919bef7bbec8baeee7a34ca2a11d48665bb36c79c5a45a3c97e992 SHA512 2dbd4e784f65b02a8c93fc5f15236df3649d667a9792f6cac929dbac5d971495bdab4825df0fcd6817b9a9f79b7a5d8cfbdf8e4d18605f0761546b31b3091ad7
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
-EBUILD automat-0.8.0-r1.ebuild 1547 BLAKE2B 22be2cedb2f609248eab28f92f5d8e4652833422af207545d11745bf68e91acb3e4e492f12045c5d8042fdd342bd678abcb63b9a5dcaf5f5a069753f2ccbdb1d SHA512 fcdc8a52942ec97c40f3dc7253f292679723f3442a2b0ad2cf815877870478fb6420dfb4f823d9041943706c50fa1b15553f015bd50d4e51333eebb501f97014
-EBUILD automat-20.2.0.ebuild 1565 BLAKE2B 25ca6ecec9f117413ddcf59cd3c3aa051783bf6451bde538b55ed2a932b3ff45f1befc123d6afc9cd867ee5d1d4c9cceb77f31fde0cd42ba55ec10602b4a45fb SHA512 78bda25e1d32b8e9c3d7c104f5691db077159310aa18c1aac951602bfafba50d9e0271742c3093fbcc619d5c06424c0d5896f1531d010f7c69469b588fb73b63
-MISC metadata.xml 572 BLAKE2B 26d7ccc6325a7ff3f051d90ffd36a50485575cd78a2bb35e2f471b2ae5c0f2a579269633db2fa98be1682b5a53271acfd97f079d8c040e30188dd07ef886d509 SHA512 6514fa4351ceffc03f98fbafff044548b350b69d78b0926e598e230fbf6ba52e8a2e0346e89b14d8c4fee914d0a846e457bebe62354ea10186dcd24c1daef590
+EBUILD automat-0.8.0-r1.ebuild 1610 BLAKE2B 3edea0d85c0a95f7473bb567df6ba321ac61336b2a6c6f5c212e9949dd65a6b054f492c76d77443dfe0631378e2ca0c164d2fae86caaca24f5bb83c3e113d0b7 SHA512 f2a292c3610f3a8dfadce8602e437de777e64dc5bff6ac3f333f91f2f62d727910158b9d37096040f5a59af4208b535cd4bb3a94f7111d19b071ed2b6bec096e
+EBUILD automat-20.2.0.ebuild 1628 BLAKE2B 2da86504c921aad90a754fa2838fc7b72001eb63ba0969f74730611e3aa88a213c706b6c4480e6c526513d546e39603cb26d30728181ae441cc5796030bff1ca SHA512 a431b832d18326efc456e0eaa967b9432ac7da0f1c821c43c862b5764a6db4be89d3fac02e81927d738626e98384acf19272c800c5fc5d410f874cc96e71ca5f
+MISC metadata.xml 645 BLAKE2B 6190e3ad235c93d189fddf477414ebb9a784a8e5fb5b51dc02123515c1673bf94c74af976f9d701d36d30d638f75b4ebe825ea9e853247f474707e8fd6759ed9 SHA512 9cdab2ff1f5671f1b9a55b8b74281e868aeb2eb702abeb9d51e71c7e0a6524844caad7c9b0d0d888435dd74d69519b2d66edd1ea985145290b92906955508565
diff --git a/dev-python/automat/automat-0.8.0-r1.ebuild b/dev-python/automat/automat-0.8.0-r1.ebuild
index d31a2e5ccc38..35f0f151aaf2 100644
--- a/dev-python/automat/automat-0.8.0-r1.ebuild
+++ b/dev-python/automat/automat-0.8.0-r1.ebuild
@@ -32,6 +32,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
+	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
 )
 
 distutils_enable_tests pytest
@@ -59,7 +60,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	einfo "For additional visualization functionality install these optional dependencies"
+	einfo "For additional visualization functionality install both these optional dependencies"
 	einfo "    >=dev-python/twisted-16.1.1"
 	einfo "    media-gfx/graphviz[python]"
 }
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index d07dff713074..dc4053b4c831 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -32,6 +32,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
+	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
 )
 
 distutils_enable_tests pytest
@@ -59,7 +60,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	einfo "For additional visualization functionality install these optional dependencies"
+	einfo "For additional visualization functionality install both these optional dependencies"
 	einfo "    >=dev-python/twisted-16.1.1"
 	einfo "    media-gfx/graphviz[python]"
 }
diff --git a/dev-python/automat/files/test_visualize-twisted-import-errors.patch b/dev-python/automat/files/test_visualize-twisted-import-errors.patch
new file mode 100644
index 000000000000..b3d8938cf7de
--- /dev/null
+++ b/dev-python/automat/files/test_visualize-twisted-import-errors.patch
@@ -0,0 +1,52 @@
+From 9f6312e0c2504c27b72bb228a37ed5ac58776e94 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Wed, 10 Jun 2020 07:31:45 -0700
+Subject: [PATCH] Fix _test_visualize.py twisted import errors
+
+When graphviz modules are installed but not twisted, this creates test failures
+in _discover.py which hard depends on twisted being installed.
+
+Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
+---
+ automat/_test/test_visualize.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/automat/_test/test_visualize.py b/automat/_test/test_visualize.py
+index 987eb3c..142c4bf 100644
+--- a/automat/_test/test_visualize.py
++++ b/automat/_test/test_visualize.py
+@@ -62,6 +62,7 @@ def sampleMachine():
+ 
+ 
+ @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
++@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
+ class ElementMakerTests(TestCase):
+     """
+     L{elementMaker} generates HTML representing the specified element.
+@@ -134,6 +135,7 @@ def isLeaf(element):
+ 
+ 
+ @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
++@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
+ class TableMakerTests(TestCase):
+     """
+     Tests that ensure L{tableMaker} generates HTML tables usable as
+@@ -214,6 +216,7 @@ class TableMakerTests(TestCase):
+ 
+ @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
+ @skipIf(not isGraphvizInstalled(), "Graphviz tools are not installed.")
++@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
+ class IntegrationTests(TestCase):
+     """
+     Tests which make sure Graphviz can understand the output produced by
+@@ -232,6 +235,7 @@ class IntegrationTests(TestCase):
+ 
+ 
+ @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
++@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
+ class SpotChecks(TestCase):
+     """
+     Tests to make sure that the output contains salient features of the machine
+--
+libgit2 0.99.0
+
diff --git a/dev-python/automat/metadata.xml b/dev-python/automat/metadata.xml
index e10e1d5c83de..94441be933ea 100644
--- a/dev-python/automat/metadata.xml
+++ b/dev-python/automat/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>
 		<maintainer>
 			<email>glyph@twistedmatrix.com</email>
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 35ceb6caf52b..d72655685446 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,4 @@
 DIST autopep8-1.4.4.tar.gz 114796 BLAKE2B 0eef2550e2e13a79e4c3199dae119ed49b13056d9bbd98be5d9e4c7d0288d12bf6ad30162c0e4c485f6de9b47b4b6ecfe92dcb278f2cb265b75e395bdda77aa8 SHA512 06822df7cd02c68980965c1fd987dec03785e155554ff0f735dc707c4de99b4d152b0d092e21017ec5d9176b33bcf22f3ef2b0986f38faebab0928443eca4d32
-EBUILD autopep8-1.4.4.ebuild 821 BLAKE2B 07355b95b24d59d1ef671c24bd1bd5e09114a7d702603852ad7fe7440ae9e819d6a4cc85f7afa030b42f25be366392fb3ca3dd06b2a3d8dd549521e5bdd1c0bf SHA512 99c3e66b00f22a3966b90a51ad3539cfe5db90cde00297c19939f3c20b39b17993eff6f6219e42a7ff72eb0f30a8160c4ecdf17416cbaefb0f839037d127250b
+EBUILD autopep8-1.4.4.ebuild 828 BLAKE2B 5165808ba2ceebf03711638b4bcc118e07500047bb8db18627578dbc344e9149cd98dc87367f82be89e331400926ef70d2bdf1ee0ad2943fe7399b9265ae277a SHA512 b1f3adfd7ef7cee3e180cd8d2307b20ca08bb826de128652945f63127e6e0643e3426945fa92faca1608a2ad5ecc07efb9184ae23b6ce90f00a40102a7b4d717
 EBUILD autopep8-9999.ebuild 805 BLAKE2B 2cf72deacc03c5063d3230e6d2c1cc2cac0fa5ae320be4e14e107286c69036774316d9ea79771a8253986841d575d844370ffb151e2ce3b6a09ca0a693eab0dd SHA512 ac92e7ec145f7186806a2e0a7c85e081cc0d997894718135f7f944421d000ac6b69f890ffda6406880f0ccf15b77fd7d51d70d74709625ed31e05739e68e9b3a
 MISC metadata.xml 378 BLAKE2B c45e6a1e950f4288d6bf63969fb59c426a483c9e27294b6aa18c85d827f0cbce3cad2111852f6c7bb9347a17650b92b98fc3234989742459c57652fb6600adcb SHA512 e7ac8c3772bcdef589f909947f23d6c97d09ca98eb3aafbd88cf4af53ed56c12f85741e0d8f872ffceefd59012e11f4c98939b0daa79590255685cbbf04acf80
diff --git a/dev-python/autopep8/autopep8-1.4.4.ebuild b/dev-python/autopep8/autopep8-1.4.4.ebuild
index e5a2e04f7e8c..1370a111334f 100644
--- a/dev-python/autopep8/autopep8-1.4.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="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/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index f11c796ab4b7..61ec749731bb 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sam-translator-1.11.0.tar.gz 96492 BLAKE2B 4025492501d17699b64041a94704d0ec491ffb02a4b7e48c2647101be4d504b6a8c08a9a043c2d964a51d1ef7b40e4fd1d993f9d3b38b5b75460a7d0117b9f49 SHA512 e008248ef3401ffe58590c6d68667f67e5963e416656daea545c8d938ab8cb5d8b1c9c7f5aea2d53cedfd74b1fb8677e99a93a8a78235198b18c14df957d0c74
 DIST aws-sam-translator-1.22.0.tar.gz 5092855 BLAKE2B 596d4162938889fd7fc1dcddfa7317bc772b2a5629940a2a0ce1329c8e05c063872ce15dce95d99aadbb80409c015c00a5ce0e4f066de2609f21008e3c5c1faa SHA512 070a9d72683251d11c3f3d41d5ae5e51249f27bd8c7890fb77254b81e9e1267fd2324dac7a246b2b1067210da9beb78cb97dc0f4a31b29e3990a300a05bd4a4a
+DIST aws-sam-translator-1.24.0.tar.gz 5142130 BLAKE2B 43c1f3741296a70af6560655363d144bd654d7184d3654b9aaee6dece52a2a5fd557f605040d46f530886abc9cb4ae55703f588bdfbf70e5eabedfda3f5e0d56 SHA512 f5278be23e9426c5b9be8960cfce442e8f1302afbe99aa76c119ed11b9de40151195534cdb8d72e3eb13f40af2f2efe54dfbd55c6bf3c5f8ce2450848bc047a5
 EBUILD aws-sam-translator-1.11.0.ebuild 824 BLAKE2B 65c797b5020337329d624225cdd4083a0b883c20523dce972f6aff6501c7398b8784de815be9430058269b8ef907d4c366fe207f922c563cecd15a7c1f6ad3aa SHA512 ba3b300c41aade2dc975e3b0a55d8f28cda4f33836f18f26733df6898b7cb84bbd8260d4e8b06374325da1fa082ac16a2a7e33998fd512affee21fe22a2f00e5
-EBUILD aws-sam-translator-1.22.0.ebuild 1341 BLAKE2B 07939310eb56db26f7025bdbbeec6f68634697d14170b2fa1d4735d91061f204ddd271d2031acbcfb326df4d01f667ad606c65d76294f46e4c38e87473335478 SHA512 a772b32e95af03673b9a84fd7730a44ed5d7cbaf5a3b619a3353c6af549faf4800d90af5aac8bd22329160e4802c8ee7cbd8815c4958a59b27cb0dde63e4df19
-MISC metadata.xml 485 BLAKE2B 10b9c47652be590d59b1947cacf9553a9b4ce84a48984f8b8d7f3084faea37d32d55521cbf3ae5850753745284e36b18013416c929cba11b2b5e92f51292db5f SHA512 c75c6b500543fbd58dc0ffa7a129619d27580935a407653ad65aeb8c38c7e56b1e5fe87191d53d9c5b336953270b120843587a1c5a3030b19e9f48fb690d78ca
+EBUILD aws-sam-translator-1.22.0.ebuild 1290 BLAKE2B 299963273afd44197a8bd2bb5be11ff17cdada8e694499642b033cf1e7f7b69d10d46739f04f4d294202db1782c0958b8e3c715b7fee291264680e83ac853de7 SHA512 3393395bbdf5bf71166a9ebd2956fce151ea4ce562d32b14cf877cf698b60a50a550e15356595e06ade6441fb697e5c5cc8fbdba72d73d24e2eca9468e55a983
+EBUILD aws-sam-translator-1.24.0.ebuild 1290 BLAKE2B 299963273afd44197a8bd2bb5be11ff17cdada8e694499642b033cf1e7f7b69d10d46739f04f4d294202db1782c0958b8e3c715b7fee291264680e83ac853de7 SHA512 3393395bbdf5bf71166a9ebd2956fce151ea4ce562d32b14cf877cf698b60a50a550e15356595e06ade6441fb697e5c5cc8fbdba72d73d24e2eca9468e55a983
+MISC metadata.xml 586 BLAKE2B 218aa559f6245f355cad9eb9cdb59734f2de73a88c9fe83cc17c78c2157e69968b5ac5b703b36743e4daafac249ba5d6866c2697d7081bc897f07ce6c457ac42 SHA512 8076d6c6af7184be3008268713819abe9027acd7be22155cc0130a8e626afc1fb45f64b63db6b86185942867293154835244842b889c24b0b05ab5d54d7734e0
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
index cea1f43cbc51..e570b035756d 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
@@ -22,12 +21,11 @@ RDEPEND="
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	test? ( ${RDEPEND}
+	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
 	)
 "
-RESTRICT="!test? ( test )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
new file mode 100644
index 000000000000..e570b035756d
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aws-sam-translator/metadata.xml b/dev-python/aws-sam-translator/metadata.xml
index de0ced977a97..d20a897dcc58 100644
--- a/dev-python/aws-sam-translator/metadata.xml
+++ b/dev-python/aws-sam-translator/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">awslabs/serverless-application-model</remote-id>
 		<remote-id type="pypi">aws-sam-translator</remote-id>
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index e38dac92c792..3b0c8a8879e0 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-2.4.2.tar.gz 66737 BLAKE2B 5f062299ad28ee12d4f90bbdcb03d691fb9a5888054eae4759b9a0e916f720e71a9b9e01fd4d11106499395c5c1aa1ec90ec4874301a34657cd04b00cb5450e3 SHA512 3d12e96a54a2fc65bd6b6772b1e9cc72c09620d9a8b900780afb6c4051b88f0ada1e2da2e31bf93c37a881514e2ae79692a287a63b44845e0e2b8cb33109f81f
+DIST aws-xray-sdk-python-2.6.0.gh.tar.gz 255978 BLAKE2B f43204a25027d0ec135222879bf9158aef65ba5ca948e734be0b984d8f2582741bb36d9ae0a874dffae6ffc5209e25fa1c69069c261256c3bee71a4fe717411c SHA512 17a4716467b7f6dc2912d969143e0b7c8c0b9ab15bc57f873ec415876ad2080218c3c526f4aa2c1bbf4d1caaca62eaf122c87debb45c925fd84a1bcf00ab741f
 EBUILD aws-xray-sdk-python-2.4.2.ebuild 826 BLAKE2B 46d407c86eb1050c03cdd3b3b7636aca7f81d634f809e7b9e9eddbd429b2edc00692a34ce5e1323433aa0a5e679827c9e5afa9cbb8d9f9271b4cbf8e2058bd3f SHA512 73cdca73f719bc40fc504079904d5417fc50d8d5a2f217ece4e46aaa577b30aa928306690341081769d1bb180da2451967ebbf084777a50f5e3065e0d764956d
+EBUILD aws-xray-sdk-python-2.6.0.ebuild 1426 BLAKE2B 0ac6bb52b242a7828052307cb3deacba25812506db96cb8d893bbc619ad9cc34683344b7ea7fb8832b9a152d01b4477bec6e4199da0481756490af4c3b3e358d SHA512 5ea8b2b6974ba2f07b2283ba2bda9e4a60cb2b1b21da907c8db145ef2165ddb3d4ecdcc5ceb39da8ade2df808063ec44c60a07e16e4e8bf3b41b2c8a107b433c
 MISC metadata.xml 453 BLAKE2B 78db6d0eab2360b69ec4b17c073e47d10693c8b63b5f0c9f28aa8905453085c9595bed462a7d010480ff37b8b11083e2ce93e24da7cd59413592a5b4fe63cd8c SHA512 5206f2494c0eb5ab56f9673e837b2878aec4f512f6ef6dd8b70ca66a0e5c9c18b5626d9a90541adb158f0d08e0644ed2fb02fa3b80283a0883713eb45fa21e2d
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild
new file mode 100644
index 000000000000..21cbd82511a9
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/jsonpickle[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpackaged deps
+	rm -r tests/ext/{aiobotocore,django,pg8000,psycopg2,pymysql,pynamodb} || die
+
+	# TODO
+	sed -i -e 's:test_external:_&:' tests/test_patcher.py || die
+	# require Internet access
+	rm tests/ext/aiohttp/test_client.py || die
+	rm -r tests/ext/{httplib,requests} || die
+
+	distutils-r1_src_prepare
+}
+
+src_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
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index f028a37f8475..1a54520b8c27 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,7 +1,5 @@
-DIST awscli-1.18.48.tar.gz 1737744 BLAKE2B 818709e924cac51fb8490383d91d9d935f812bb019a71051a2a062676b2720eecd2a59b6c398c599cba6caaf7da35179864eb80fd91cc5ec7547cd56d89de01b SHA512 1501a4d588e2ce2f4ed668a8e827403ed4e4d4588fabef26aecbc6521931ccc760918ce9ddd14af92a94d17cc980a84a3e95f5f21e84b955d2923a0daf62fa7a
-DIST awscli-1.18.56.tar.gz 1738900 BLAKE2B 520ca08c2b9d52c666247af375fc4da5f4da9e5eb779001ee70c5c77c9c9faba7fae045baeab6bf74c5727cccd6499accfa3b554b0c2082930c855a06be8cc45 SHA512 4c5f126bf485815a9bf48c2ead1353e5b1cbc6ac34201303c3e245a88c4b321bfcdec96cbbee6419e7128285c03b938fa0138c2f6204699c3fc8f045a6a7ad09
 DIST awscli-1.18.62.tar.gz 1739551 BLAKE2B 029119e6c4d9078f46507c1837c2122f86ab3bc83e8e34bdf6ddb969426769845ea6ae49d8f1cff3e4c9d2951ce562e6bf395b67082efd3eeade0e2c36638ab4 SHA512 08e996d4cdcb941553969310b998a033a4a4dfeec1de44167e8cd3c4a46e751858285a8d33ddc348c1133c90d25bb73da6ee33f6e2c94c3dd8dd79f56b85014b
-EBUILD awscli-1.18.48.ebuild 1300 BLAKE2B 6fc3216460f5846bd90bd041dc8ae1720766ee843d10895cdce774d731350e25b7d38d7e378ffbe5b86eda29c79d530f5105037084ea73926b6970e9ce383d60 SHA512 5417779f94e0705bbffd1e17fb7194e13285108acd67e88d8708b44ac3e575a0bfac36a69efbe531576b0e1d9b22c3831322d1da5e86ed0acc3c4cdd6f6b3dc6
-EBUILD awscli-1.18.56.ebuild 1299 BLAKE2B bf71bd85a619a4ad301994d94ba91bb3fe37673b21fb4cec08e6ac1f5f6c7061c147d80b90fdb583d83d8461cfb62a645ece358a67b48ef56d76ecb2cb5f82fc SHA512 2981353ced5234202dcbb15ac0c928e6ee9c3e2982367326036deeca77b9c01089400b9d6a5a44f9eac4e48f9546ed29858b8bac3e27857cb00e3634969714ed
+DIST awscli-1.18.70.tar.gz 1758807 BLAKE2B 493bb9193ebf3f01e8088c4928036ef806d2a2802b3de6bfc7ca7c2f17d655a367601876be939e89fa7c28b4a7f5a5b6c9286707d3ddd1f7339cfcc35e2f85de SHA512 f81f7077299291a80a2965da91f2f09ca40918bc12faa3312030f5783df73503d61da9765bef4b17b71b318a71f8808dda9ede0aa276c4f055b2d5a69e299c1a
 EBUILD awscli-1.18.62.ebuild 1300 BLAKE2B 9469c174230b8029cea1cb1f441132bc151a833f48304413969394afa5025c083b6184286f19b5b85df428df861c3e81282b0ff1e86362964a3d0ccbe33bd3d6 SHA512 c035056da8db246c8196c4ae57654a01bf553e2e784ca014f57a3aeba22e813d6d73c7f983be0811123a1e5779a281a3a743af20b945b52414833bc0c0b51569
-MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
+EBUILD awscli-1.18.70.ebuild 1300 BLAKE2B 1251b30a7529c3d1ce816070e45e5cf70cb5456862752c20d7d11bd821ec4c142550e5ba74b294f7bf03fd1791ceaf89a78fb58650623cb32ac19bdcd22864b8 SHA512 ebc439a2ca2f296ba77510419a98ec428f5e9fce6a85273ddc7e6f9b6a0f91a6f3ae4f467182a3ec1031c5bde8986630f2e61835dce3f3c145ecbfb0ff50cb85
+MISC metadata.xml 429 BLAKE2B 6bf226a38913939d1184f9026bb30d07ffdeef758f8a3e953676fcd89bd6fcc1c780b9afe38b209b3c6bd16de44de86551b71c48f8ec40a4772d915ff6c3a21e SHA512 b189f9d0078a3abdb9115365df9cb5ea0b1f8ec3ca10a1b05658d5fe4fb4fb4bab5ad9ac91b095938bed18f875e1336777ac89f23813d0e54ffcaab0fb52054d
diff --git a/dev-python/awscli/awscli-1.18.48.ebuild b/dev-python/awscli/awscli-1.18.48.ebuild
deleted file mode 100644
index fff1d0812e75..000000000000
--- a/dev-python/awscli/awscli-1.18.48.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.15.48[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5.4.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.18.56.ebuild b/dev-python/awscli/awscli-1.18.70.ebuild
index 4acacad4af86..b46fe39b26d5 100644
--- a/dev-python/awscli/awscli-1.18.56.ebuild
+++ b/dev-python/awscli/awscli-1.18.70.ebuild
@@ -21,7 +21,7 @@ IUSE="test"
 RESTRICT="test"
 
 RDEPEND="
-	>=dev-python/botocore-1.16.6[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.16.20[${PYTHON_USEDEP}]
 	<dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/awscli/metadata.xml b/dev-python/awscli/metadata.xml
index 07a14144d9eb..f0f862e9a798 100644
--- a/dev-python/awscli/metadata.xml
+++ b/dev-python/awscli/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index 21a427754c90..bfbe80e45c52 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,5 @@
 DIST backcall-0.1.0.tar.gz 9690 BLAKE2B 975944b508a4488cd78620b2f6efa8b0ebd7404966db5a53e409000c11641c979abb269289d3e570d01dc50961c881fe80ebbc2c6b79a01ce563d4e3f855af63 SHA512 359c483fbc8998fc2420daee2a6af7566c47fb03f64e465aa226589a2f98a4b219ab5e5b90e5f677087827a1ac658c02ec3062e9ffe9ac1ebfd9db3bb40339cd
-EBUILD backcall-0.1.0-r1.ebuild 458 BLAKE2B f0ac89a0285c3dec416d33357a8ee0986c25a31ea63a08fcf86807247c2dadad62c82b5ae5ad2a5b7520bee2297936dba431be941d39aaca8a9f4705de8787e8 SHA512 3acd23e49779c3fbde3ba688f31c28b5d20baaad50255e0bb5f543bf9d8d8870feea03acce983b8fab7a82703266c372f5201dea0d286a561c911b273bd6f202
+DIST backcall-0.2.0.tar.gz 18041 BLAKE2B 67f9ac96d26b368972a5749775a70c497b5705b37d45ba7f64c1259be776cc7f4c9d78ae51da9c1e9e46521d33bf511790675688feef88a68d25ae30cd79612d SHA512 7f086121c485c0ea4bc6935e7d116c8b14ff44ff6001a49665d0a698b6cf9a809823b9bca634a78d92cf40656f953dbac0132241327a5fa6be0ea685ff63636e
+EBUILD backcall-0.1.0-r1.ebuild 488 BLAKE2B e99b8b5634e20f6d11cf882759b1faf175a25e1d880c49c5aed0419f742ddb769650ccb1989917f8583bfa31ebe7b7281539656fa0c5e12dd33d7092611bc1cf SHA512 68a05026b1696e375be1b920b6a56b9b864182d122e1313e988d3d8faf578635f96d7c18ce69525fa49da8810af6b74ead507b63141fdd88d81fb6638fbc27fc
+EBUILD backcall-0.2.0.ebuild 491 BLAKE2B e61d16b9ef5129a73cffb6e261b4de402148b93f7afc8b1d400b8ac93a9a1237318178f3280468d6e18cfb93470e6df95f6f9ee47ea7038359995daabef12407 SHA512 66d4124b0ccb29a3791566ac1cfc0dca939d2190c7a4462e6d0aaa03e96be1b35dff52f3814d276d582d184de8819b2edb8cd0445d3c0d7600be65812c70b5c0
 MISC metadata.xml 311 BLAKE2B 7930b7db6a4df8fe11e5490dc1df86b4468954db1a5d7508e95007780b5df1cfc07a2783638310cc9d52ffee52ffe702d4f6f46146d8c88adb4e9036bc5de8f2 SHA512 bf3b5d9da6f976f24f791baca8e2703dca2fa1e7d0e7e3958951147770c0448300b6875c405bd4d09cec2561ad6856d4d562a511c57e94f342adda68538708d0
diff --git a/dev-python/backcall/backcall-0.1.0-r1.ebuild b/dev-python/backcall/backcall-0.1.0-r1.ebuild
index 3168ccb468da..4cdb8b03978b 100644
--- a/dev-python/backcall/backcall-0.1.0-r1.ebuild
+++ b/dev-python/backcall/backcall-0.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
@@ -13,3 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/backcall/backcall-0.2.0.ebuild b/dev-python/backcall/backcall-0.2.0.ebuild
new file mode 100644
index 000000000000..75f09c046268
--- /dev/null
+++ b/dev-python/backcall/backcall-0.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Specifications for callback functions passed in to an API"
+HOMEPAGE="https://pypi.org/project/backcall/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 26bb5f47929e..cf18f5deb919 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,3 @@
 DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
-EBUILD beautifulsoup-4.8.2.ebuild 879 BLAKE2B bf910869d4801b58f05454bd9a4e5bee39020be7d350bea75c1a9450629d7777f96cc678693c6696e05cb8c1e9bec1731126a4681060661dc05b8ccea681de2b SHA512 28925af89e6e8f7e4ec744c64f512c8afe88cdfd033833592c2d51daf252abfa8dfe032598bc2ce6607039da0df02bc99221a7cf8aea419d4c47cbca27a97f11
+EBUILD beautifulsoup-4.8.2.ebuild 865 BLAKE2B fddd64a95914844deee42bf9e6f16ab74899b5aba97531ed8f0c28569fe38cceb7ae4873468749d1c05bb5cb5f73abb4e80489cd744cc55723783751e413a463 SHA512 7dc8966ebcf3e1b55e1e7e83a9c62a15721a94058a766102df6469acb34b4026c31b36eafdb02797151976291b610dc50eb4512ea6cb1103f4bf3fe0d4ac0588
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
index 8bfe741fc285..67171073bb41 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
@@ -13,6 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
 HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="4"
@@ -25,10 +26,8 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 distutils_enable_tests nose
-distutils_enable_sphinx doc/source --no-autodoc
+distutils_enable_sphinx doc/source
 
 python_test() {
 	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 5217df998dd7..9071b42a8b6b 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1186 BLAKE2B 6c1a3902a18378aee683814c6d2b874fe2183e4e700c13e6ba69d1971c399da4a5d85fbaa4620513d2b3167146a295e05607d9e00b2a3e7dc107380564a68755 SHA512 3b49fe8ee63ab920887332ef2645df245174d725e2636a0507aafee9ef1586262ad8dc3f467238f0480767e6dc42a5b1ebb2237b173abbf53ab7f1a0bd7dbd26
+EBUILD betamax-0.8.1.ebuild 1197 BLAKE2B 62b08c43b3017cd170547ac5fa5f73c21dd5581bc992ff7755b9277352d9156d3df767aa1e87a2db54ed914cae4d224c2cbe065f31aaa714170c005d78eb2ec6 SHA512 0f5acc190d2679f6823a54c1b5f5c03032412de83987ce8e40613a4df4e806f128bb2153a776a81a71fbd341cbc68f8ee867f1e13cfaac288be2a2d7d56bed6c
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index d4fd29f0af6f..bf2c16108500 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
new file mode 100644
index 000000000000..a34930dfabf1
--- /dev/null
+++ b/dev-python/black/Manifest
@@ -0,0 +1,4 @@
+AUX black-19.10_beta0-setuptools_scm.patch 706 BLAKE2B da031160089a1bf505656b301c0d8b43736a4dab641d4f1ea9cd5c98286e9ed10415cfadbd2197499d8b91553ff8f664a0e782593fe7ae10322b149001a2133b SHA512 ee8356ddf6208a20fc93e16142a5ccc37d471dfddf60e0b40fb4d03045ab2fc7e5f3c547a0cb1dcef032d8a24074d60e8ec413be36e981d2d9dfc39d7f93e5c2
+DIST black-19.10b0.tar.gz 1008099 BLAKE2B e8a6e286e7a60f880f8b5d37a2b07278faeb4efffd15feb511764e449c36b4e54d5ac5b910f583a15948a2f92eb5e61ae210073be7a57251b2b01e69d2e5b373 SHA512 778909c26afa65548a77524451b50a2692a7b4e297fa52fc80567f7fea94dd5aae9e61cf0f1de718c28a733f1813c8e2c6974ab58e6b0e891de331bb4f245968
+EBUILD black-19.10_beta0.ebuild 1693 BLAKE2B 7987cb2da1ed8d6d93166a73f4fae5f0682538499c71e395b252ac9f3a94e842ec8242fdf092b4f3862b8fba300bc33b50de095c8253a83b88a0a80052c1c6a4 SHA512 8364031096552f27fed2498b3856e1b3c66c819838bd50d86d20e5a950bb6ad4c25e75b39736699709014f62c083f99693ce201655800c34916f54007cc9e1c4
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild
new file mode 100644
index 000000000000..fa3a4c50efbb
--- /dev/null
+++ b/dev-python/black/black-19.10_beta0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit eutils distutils-r1
+
+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="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/typed-ast[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/black-19.10_beta0-setuptools_scm.patch"
+)
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	local version_path
+	version_path="$(grep '"write_to"' setup.py | \
+		sed -r 's|[[:space:]]+"write_to": "([[:graph:]]+)",|\1|' \
+		|| die "could not find path to write version to")"
+
+	[[ -e ${version_path} ]] && die "could not find path to write version to"
+	printf 'version = "%s"\n' "${MY_PV}" > "${version_path}" || die "error writing version"
+	sed -e 's:setuptools_scm::' -i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_black.py -v || die "tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch b/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch
new file mode 100644
index 000000000000..21f996480386
--- /dev/null
+++ b/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch
@@ -0,0 +1,24 @@
+diff --git a/setup.py b/setup.py
+index 614a8d6..66946b2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,6 +1,7 @@
+ # Copyright (C) 2018 Łukasz Langa
+ from setuptools import setup
+ import sys
++import os
+ 
+ assert sys.version_info >= (3, 6, 0), "black requires Python 3.6+"
+ from pathlib import Path  # noqa E402
+@@ -17,10 +18,7 @@ def get_long_description() -> str:
+ 
+ setup(
+     name="black",
+-    use_scm_version={
+-        "write_to": "_black_version.py",
+-        "write_to_template": 'version = "{version}"\n',
+-    },
++    version=os.getenv("MY_PV"),
+     description="The uncompromising code formatter.",
+     long_description=get_long_description(),
+     long_description_content_type="text/markdown",
diff --git a/dev-python/black/metadata.xml b/dev-python/black/metadata.xml
new file mode 100644
index 000000000000..56cae167d372
--- /dev/null
+++ b/dev-python/black/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index 4466c685bcf0..dbbed3dbdf7f 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,3 +1,5 @@
 DIST blessed-1.17.5.tar.gz 14030669 BLAKE2B e2692c6863599462914f1cee36bd487d42fb1e44e15f841d81ee622619da22a34cda4d78523b07bbd94a9a70e41c9b8342d0da650389d0fbe4ef7a46868535cc SHA512 5973070199d16a71d70c6b25b783a92d72f9dd8d27ca5cdb25b18e07e4b351e1cba751b96113665230c3c01bd1916adafe89d4689e2b341a88640535b7f91317
+DIST blessed-1.17.8.tar.gz 6697594 BLAKE2B be279f1962e8643fdd2f03c63292700ebcdd89f29163f72de89d649990663e9677391a134e19e97fc51c64341f2efc9dbb8a13a467f864c04341a55fe31a87c1 SHA512 fbdeea8159f535824600bd4e9b080998d0a8336731c1d53ff5b89c7488363d35b87752b8e424317f64f2b90aec3c62ce3368503b1a864a67c1de48245dc2fbbf
 EBUILD blessed-1.17.5.ebuild 1246 BLAKE2B f91427e6e66f6172c9d3ac7585ce6c6863d8fc9290313ee38967961d86d28d87138cb121ea40dfdc0a4886d99f69d82fd358eaef6d64d9e28fb1a209336c37ee SHA512 adade6c585167ca0b8dab2cc7d98bf466a3e3e958905c0ead79d0151c5c1596105c8b1e9deca72dddb6c7e30c7c6246e1f9778ffe66a32b2abf364e50cbce5aa
+EBUILD blessed-1.17.8.ebuild 1246 BLAKE2B f91427e6e66f6172c9d3ac7585ce6c6863d8fc9290313ee38967961d86d28d87138cb121ea40dfdc0a4886d99f69d82fd358eaef6d64d9e28fb1a209336c37ee SHA512 adade6c585167ca0b8dab2cc7d98bf466a3e3e958905c0ead79d0151c5c1596105c8b1e9deca72dddb6c7e30c7c6246e1f9778ffe66a32b2abf364e50cbce5aa
 MISC metadata.xml 431 BLAKE2B b957fcf973dc786a7358b8554d5969688c86974ad0d304ac752f1f48d246ba955a9acbe4ccedd0a670a3039488c1b9dfc6815b08e08e7085fbef39e62c447f59 SHA512 b962ca5f456fe442dd2d88866d9aec050d0b456b53f22900cda6ec304a055909c0befe2de085775283c9b098fc9d7f53351b9e67d55eeca1744fb09622eebc01
diff --git a/dev-python/blessed/blessed-1.17.8.ebuild b/dev-python/blessed/blessed-1.17.8.ebuild
new file mode 100644
index 000000000000..18fe22388d9d
--- /dev/null
+++ b/dev-python/blessed/blessed-1.17.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
+HOMEPAGE="https://github.com/jquast/blessed"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# Skip those extensions as they don't have a Gentoo package
+	# Remove calls to scripts that generate rst files because they
+	# are not present in the tarball
+	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
+		-e '/^for script in/,/runpy.run_path/d' \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# COLORTERM must not be truecolor
+	# See https://github.com/jquast/blessed/issues/162
+	# Ignore coverage options
+	COLORTERM= pytest -vv --override-ini="addopts=" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index 88b7c7ffa46b..569c7cff6874 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,3 +1,3 @@
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.7-r1.ebuild 1097 BLAKE2B 02ed46c2f5f98fe340d2249adfff4a1604c4e28fbbbeae4e44d81781a658d4ad564589ecfd97b93e44646e0e26dfac3b99158957500aeece6099840ac2b59d13 SHA512 41902da4ee7f57499cb328cb0a54895c8d3cc60019d8cd3aa6372f19bb6876323dfc1012c61d3f36148ecc5ffdf39d06fa8f9fc13d99ac718393c7f48b2cd284
+EBUILD blessings-1.7-r1.ebuild 864 BLAKE2B da135ce3689762094251a43a3bc3abc547cf91731604414be409418175041a7c56f2d894a416ffe777bdc0bf7aec2d395b735e6b4f4db10d8985b71da379656b SHA512 67303e0791e6bfcaff0de39fc0a910b4287e3a89677f287053fb26296992de2b7772d2800ed771e3e551f515567b79a654d4ce3ac1138e444a599d39d08e34bd
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
index d9b166b70bc5..5685726fc785 100644
--- a/dev-python/blessings/blessings-1.7-r1.ebuild
+++ b/dev-python/blessings/blessings-1.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
@@ -15,24 +15,11 @@ SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs/ docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
+
+distutils_enable_sphinx docs
+distutils_enable_tests nose
 
 python_test() {
 	# The tests need an interactive terminal
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index fe93d8ab447d..a1acfe7bf656 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,3 +1,6 @@
+AUX blosc-1.9.1-unbundle.patch 1066 BLAKE2B 28138077ebd4f2efe9abd0d87e8e894299fba8df755a322fc77c6d00546cb12e106520bfeec4f0e750b9943fe448db2c6d44e75972cc6db01c10777bc943999e SHA512 dde7c2184da44bf3ed0ea3c9241550b30ae918f785727c812478fc1c085bb7dde99180d3b02a965e7d1c7126ede3c53c5cef409299fd253e2893452174c277fa
 DIST blosc-1.5.1.tar.gz 641172 BLAKE2B 2305c8a4b32192393182306c1ae074caff1bab28b7c842c14f737354c282aa30ae1f9d6cfa5c4932832c505a9d1eb1a579cd2303d1800ae42e52fc58100ca99a SHA512 76d8c5d9e0e3485aacd5646970ce62e34d6ef3ff04e134342544ab044c4d1925a537187b4ce8b7ef3f6cd327e26d47dbdf1bf04233186a8baedbc7c839071cf8
+DIST blosc-1.9.1.tar.gz 809621 BLAKE2B fdeb76e5714d94a9992b59b99926a54457850c69d9d2c217b5a57cd8ce0d8886853ec139683a68c96d3a697b11f68163a7f267cd6060eacba78f595d4ff67d5d SHA512 61ed4e184c1a3e19a2556e5eb4f30030c00294af7b2d5b6c0641160db53c65756170c138229edd684f41606b2a3ae0b1c4f5e01495e74875e5123d7e1d8ed9c2
 EBUILD blosc-1.5.1.ebuild 805 BLAKE2B e5825550ae625b6dcd17fd15f83f975838925defe91554994b132848cfd33c451b80f093041382b56a3a9d5f7ac0bcd92be52b7da72de4323eab98f122093519 SHA512 24cc25dd0ba09cc3c5ad3c4473c022a22dc94194cba71e7595634b85b29469c4243796afc19714e90fef07de5d10ea749e0857a023e34950493f828e175a2b71
-MISC metadata.xml 891 BLAKE2B 2ed113aa84063255dfc15d018340cda188c9441a252a4d5c86f1821d5b7f16df6084a4469f05bc7cfca16439538b7d2f5fec105ac709aa9b056c537d8840edbc SHA512 e4ece5eb12f91e4416a8a685260f6bfdfee12ca64b7f2ad4ce0cdaa81287a24b1f51a156c7502b1e16341088743d7df9fdd36aa9095ab9d02e0bfa28536bb9f5
+EBUILD blosc-1.9.1-r1.ebuild 1014 BLAKE2B 7261b0d8d013167ddfb48a0461475e721faffce6157386c3b3f90a41361fa515ea771c2582535c461c173f31809d67883164a88de80c3908e85a5d638ee8e0b2 SHA512 098cbb1548278d5c2446c80f92fa41191ac53b803c368cb634b0ccb77a459a6aa028a1a322ac294aac1cf5bc2740d24078926df5eab38ecdd8e407ec4a295215
+MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.9.1-r1.ebuild b/dev-python/blosc/blosc-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..11fa0fc160a9
--- /dev/null
+++ b/dev-python/blosc/blosc-1.9.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/c-blosc-1.19.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unbundle.patch
+)
+
+python_prepare_all() {
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+	DOCS=( ANNOUNCE.rst  README.rst  RELEASE_NOTES.rst )
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/blosc/files/blosc-1.9.1-unbundle.patch b/dev-python/blosc/files/blosc-1.9.1-unbundle.patch
new file mode 100644
index 000000000000..55af5f0c621a
--- /dev/null
+++ b/dev-python/blosc/files/blosc-1.9.1-unbundle.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2711877..a4c949c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,16 +4,9 @@ find_package(PythonExtensions REQUIRED)
+ 
+ # Todo: c-blosc provides a CMake package configuration file that we can build
+ # against if blosc is available on the system, etc.
+-# find_package(blosc)
+-# if(NOT blosc_FOUND)
+-set(BUILD_STATIC ON CACHE BOOL "Build a static version of the blosc library.")
+-set(BUILD_SHARED OFF CACHE BOOL "Build a shared library version of the blosc library.")
+-set(BUILD_TESTS OFF CACHE BOOL "Build test programs form the blosc compression library")
+-set(BUILD_BENCHMARKS OFF CACHE BOOL "Build benchmark programs form the blosc compression library")
+-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+-add_subdirectory(c-blosc)
++find_package(blosc)
+ 
+ add_library(blosc_extension MODULE blosc/blosc_extension.c)
+-target_link_libraries(blosc_extension blosc_static)
++target_link_libraries(blosc_extension blosc)
+ python_extension_module(blosc_extension)
+ install(TARGETS blosc_extension LIBRARY DESTINATION blosc)
diff --git a/dev-python/blosc/metadata.xml b/dev-python/blosc/metadata.xml
index 05e88ce58aa7..b264b7dd62c9 100644
--- a/dev-python/blosc/metadata.xml
+++ b/dev-python/blosc/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     blosc is a high performance compressor optimized for binary
     data. It has been designed to transmit data to the processor cache
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
index a47e682a4599..1b4f76eabb68 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,3 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
-EBUILD bluelet-0.2.0.ebuild 574 BLAKE2B 4ea48f44d9de746e1668a895cff7e796b3e899887d9a815e86ba2233970620de25ad0500b65e6dcaa03759a00942e4c98e1ced6386f369955875a8ff086e5551 SHA512 f0050cbe762c4567a8c5163c8af92db4af8b2aa00770d657c094a8811c82c6fdac383f2d4669c1467be3bcd65188ac09dd61c77c934688747f2014d24d3ed426
+EBUILD bluelet-0.2.0.ebuild 578 BLAKE2B edf3f2ae7736e65157ad52897f468307d5edb35913f94386613b7e30e85c599faacac6f04d47cf552ad6d26f274ae4ac1b5bcfeaf9f7c964bc9cbd97c89d986a SHA512 cbb0a04b634ab839c32f2435037e8511add9f657876ba2dd0abccd71bdebce792b544fca8db1f655d9199dff206a8fb222aca23c6b81840aab97f4a7c9a4fd26
 MISC metadata.xml 969 BLAKE2B 64de2c903db588aa64c305a35d712d4a8905051cf021968081f39ade06cb393ef2028f96401259b359497d0acb422827f640333485bd7f5ace79a6fca7ab782e SHA512 98ec10adf32ffc4b2adcaa10f08e3e8f24e06aa22b66cb9a372952583153688349b11bb99654b8c53901b073085dcfbba6fe11b943b6ada86116d36163b89908
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
index 6c67486dcc5c..eb755c3e13ae 100644
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index 1ae12a5b840e..8b38c4a9a20d 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,5 +1,5 @@
 DIST booleanOperations-0.8.2.tar.gz 165059 BLAKE2B 978b992e84181e8ec437e236e6502a6c135ea011395f3b082881e6b9f5c849632077737064d1102164cf083edc8a7e47c6f4f43d858948d9046ed231c5ac8911 SHA512 3c369ce53bc7b1b53f4441ba79959d4853c9ab767fef17fc41f44812427dcb5ad905fcfac4cee0d616447cccd059fce6a1d168b0766054659fb29b33867d1fb9
 DIST booleanOperations-0.9.0.tar.gz 165127 BLAKE2B 9f72246afa46c414e3ff9ad23b86da9665a90180fc058ca278b82c1281e798d9d913e496995ca8d45ff948aff5da8a6de26706afdb5e538dee64d7ffe96c7324 SHA512 a63dec9c3a8008825538498b162130624b4d2b9ca64980a23d631601928c5fc6eebdc8f03f19094b7923b008bde6a87b5f21518cb33c8df3fcd41fd84a8ddde9
 EBUILD booleanOperations-0.8.2.ebuild 670 BLAKE2B 47c5e24af6a28088c1d66d5ba4910e0f28202f42141b3f9bfcfab87242251a182daccf4bcfbf39516c7bb25b9944dd333626953a7f1d2da4a1c636c541c818ac SHA512 872c101a401c06a049c4859ec44e211cba67cf3f37dd57348a2d2d0974d2a010685668bc3985a04afc10f05ff28a401ffc5049faa9085ceae954a2a7f6c2dd40
-EBUILD booleanOperations-0.9.0-r1.ebuild 783 BLAKE2B 90ce0ff40fa933e6f10b50eb9e81a326002bf80c9b5132b88ab3c16f3e82e1dc9a3ea0a1141efcbe2f03a7172b123c8b12f9575cda0232f59867058803aff97d SHA512 f9497ed99f5d1782bf1fd6bd4016998768e256a64b70e3bef08c451fcd781bda4adfdf20f6139a138b783e0395016b99a12909d3dabfeb72d0071ce249370836
+EBUILD booleanOperations-0.9.0-r1.ebuild 801 BLAKE2B f5ac958de0692f1b0ab1e95c9c582d77409157e44aa06ec6f180aed18d7acec1ef76ce7b2a53c8ced46612b65c9b9f5c54a4c8466a74fea77881f1a470ca524f SHA512 ea379ba221cbf4ba7b1041d0d7818d3fa53e69ac40f9028df03bd982d8d29f4415b861c85a6c98bb12595d69cc8602b11489890c8142d74d7284e7f98a5fd271
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
index c3e09037a85a..3d944a88b2be 100644
--- a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index 572709726ccc..8ab198480208 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -1,5 +1,6 @@
+AUX boto-2.49.0-py38.patch 2061 BLAKE2B a17cc48925216f333a12631051f177c9d91199eddcb5dd08c22a3c8381af743b0aeeb7cd5642bb030e951596ee98477abf1e7507a4bfabc9d36706e7809bf031 SHA512 ba42dee03c39cf238c6cb1864500f5d6c0fabcc395021cba8745c3e4fc4e59828eb7f461d5251367d37c4e0709162117e97aeabc08f941fe07c65f6b179244d8
 AUX boto-try-to-add-SNI-support-v2.patch 4329 BLAKE2B 3be0a3a88bc252bf8cbf316d3198b58ca86ee61e991400ce1e27854433bcf3709718593c58ffc2e2ad16fa41630a54670a4b7d42efde572073adf5f5f95994e2 SHA512 48b1fa089138a22ca9749fe82a1d92abf7570edf87a6ffc48f9b2389baed8982092afc2cbf1e35bf0661f185e96ba2b2b6d21cb2c553d6d884e800805f013a9a
 DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
-EBUILD boto-2.49.0-r2.ebuild 883 BLAKE2B 128c3d8a978a9249a578bc2637fa0abe25ade76fe55dfe3e7c595df5e9ab9d4a172dff3d5059e02c96d1717bee75ab7f1f419b0047be207aec27a96f58e7aa48 SHA512 ddc5609597677dba4b882260a171160a93c9a9776758c6b9dd789ecbdb6fe2a643fa82e7871a4b65a0d4449ec2d93967831c264c532123d828c849df62a367f7
+EBUILD boto-2.49.0-r2.ebuild 972 BLAKE2B 75b9deca3bb8c6ede255ffdb0cb2387290b5e9cdf7f1ae3a868ffe28b044a24925af5bae0c787cbb806a5943ec1d1a96d5f7fcdf134d53aa2c2e9208a09e61cf SHA512 62756c8ec6ef5b50ff31bd35ced6c7a5f4ad60aebfdfd3d59441ebdde9a1712951a9d5e9c224e0ea9d1de330aceebcac71f0e3862df4c1d6915e26160a5c0d65
 EBUILD boto-2.49.0.ebuild 716 BLAKE2B e8ddc4cf764002fc0e9e86de50b5ea4a97d06b386525f7d54d9655ad2b32b7372c5ea74b7042004edb6e45e8ec56488da46e0ceed45f4f331f0f58669204dd40 SHA512 a939e1be7b3e0d6d57564d25161404c1c51efcde213606607cb5a7cf792ab12eb72cd25fa4113a01e908da8fd4b3e27eae5232570a6bbdb8d319056e88b3a24a
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.49.0-r2.ebuild b/dev-python/boto/boto-2.49.0-r2.ebuild
index 4cb94d5afa65..0e774e24a221 100644
--- a/dev-python/boto/boto-2.49.0-r2.ebuild
+++ b/dev-python/boto/boto-2.49.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -12,23 +12,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="!test? ( test )"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT+=" test"
+KEYWORDS="amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 PATCHES=(
 	# taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909545
 	"${FILESDIR}/boto-try-to-add-SNI-support-v2.patch"
+	"${FILESDIR}"/${P}-py38.patch
 )
 
+distutils_enable_tests nose
+
+src_prepare() {
+	# broken, not worth fixing
+	rm tests/unit/cloudfront/test_signed_urls.py || die
+	# fix tests
+	mkdir -p "${HOME}"/.ssh || die
+	: > "${HOME}"/.ssh/known_hosts || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
+	nosetests -v tests/unit ||
+		die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/boto/files/boto-2.49.0-py38.patch b/dev-python/boto/files/boto-2.49.0-py38.patch
new file mode 100644
index 000000000000..0052c6e32e86
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-py38.patch
@@ -0,0 +1,54 @@
+diff --git a/boto/ecs/item.py b/boto/ecs/item.py
+index 79177a31..292b05af 100644
+--- a/boto/ecs/item.py
++++ b/boto/ecs/item.py
+@@ -21,7 +21,7 @@
+ 
+ 
+ import xml.sax
+-import cgi
++import html
+ from boto.compat import six, StringIO
+ 
+ class ResponseGroup(xml.sax.ContentHandler):
+@@ -67,7 +67,7 @@ class ResponseGroup(xml.sax.ContentHandler):
+         return None
+ 
+     def endElement(self, name, value, connection):
+-        self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;amp;", "&amp;"), name))
++        self._xml.write("%s</%s>" % (html.escape(value).replace("&amp;amp;", "&amp;"), name))
+         if len(self._nodepath) == 0:
+             return
+         obj = None
+diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
+index db15b56d..89d1a524 100644
+--- a/tests/unit/utils/test_utils.py
++++ b/tests/unit/utils/test_utils.py
+@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase):
+         def hmac_hashfunc(cls, msg):
+             if not isinstance(msg, bytes):
+                 msg = msg.encode('utf-8')
+-            return hmac.new(b'mysecretkey', msg)
++            return hmac.new(b'mysecretkey', msg, digestmod='MD5')
+ 
+         class HMACPassword(Password):
+             hashfunc = hmac_hashfunc
+@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase):
+         password.set('foo')
+ 
+         self.assertEquals(str(password),
+-                          hmac.new(b'mysecretkey', b'foo').hexdigest())
++                          hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
+ 
+     def test_constructor(self):
+-        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg)
++        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='MD5')
+ 
+         password = Password(hashfunc=hmac_hashfunc)
+         password.set('foo')
+         self.assertEquals(password.str,
+-                          hmac.new(b'mysecretkey', b'foo').hexdigest())
++                          hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
+ 
+ 
+ class TestPythonizeName(unittest.TestCase):
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f963c479ad18..e88b5d399652 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,12 @@
 DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b5be1fe5f256f725889f9819db632c6e6f217e3f01ebb0aa5594257a5bdaabd8dcc5f14ccb5bdd333b1c416c7 SHA512 37ea11f5ae9263aa5e97ce94f2834c987190ba2eac4a60bf9312bb643f1d204e48db7bef6ddc0d46ae124109ec6807589108b58f3024485de163fd8f83688b42
 DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de32677684143145b12dd54182d4fedbffa5656d36ab854006c0cc6009a1bca351bb5ac2ea757cb70b446924bcae625a8 SHA512 3cf5533dd5d9aa51cf46ef81ba25bb7afbc73b1e745ea5ae47935b22da290c7d2101e377b3225f970168201dde0bf2ee967e24eed86548f9045eb72840afea6b
+DIST boto3-1.13.26.tar.gz 296782 BLAKE2B 117bb18679fe3ae8c4feee1a5fb2d1df1923764bba3dce72040ccc802d10bb88263744a0491195f414761b6755353775a8a413a121a5a0fc42373a4e9b8aac1a SHA512 513ea4b39a5af4ae8e45f6b8b315a19d5184998fa881782bf2e6074aee36a709b51813fc9fe403bb8dbfb9b51ead50367af18f0918a1c88a37eab263ccddd11a
+DIST boto3-1.14.0.tar.gz 297008 BLAKE2B 7f5eaf4958395b47e936596b385b5a4daa20dbed6b777a407b6c2f70d3004d89fb963f479a1a3c8be22a3cbbfdb21f59a1f3c3ea4b967fce4799fc965899bcf1 SHA512 12ce4765f22e848aac0c29d1f95ed7b63964868f18c14073f93c74e442babf8708aa69cb6c17bd7c3aa5dacda6beb67bb4a4afe86fcd298308c70abfb77802d4
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
-EBUILD boto3-1.12.48.ebuild 1293 BLAKE2B 92aad28866a299a2a734ff0d36a31a8bfd25e9ecef8e055415c99efee0cd5e23b0d1ab29830d70ca15531b830472b9e07f3cffff2e3c5085800a64a6cc138a1c SHA512 3d0310fccc683e421bce7b4eefca8c469bcaea84f191e6758b2aff6cd267910b7bb96bf0045c81eac26d5ffc11709a8cc0ae2ba6969f3d8b0d3b3e581d359805
+EBUILD boto3-1.12.48.ebuild 1291 BLAKE2B f99f5a2cf65a8598fdcb29cc0acc98919045b9e41de89ac7587cc62b2368f025671405721a411f7c23d7fb08410f7883882fe8f012be118ab4caa5c68674a7ae SHA512 28e4ed7ccb7af041e17eebdcf13027c3b80e0e30b83b098f212c032d03fc9a960433e360bdc741706d7dd4b5b20a6f425399d739190dd7257a5cba64ce4552ad
+EBUILD boto3-1.13.26.ebuild 1233 BLAKE2B d5e4817534127c58a74846722b6b1251eaad1c040ec3bb87ffeecfaa71611367d589231b0b33f1d443bd4daeca4d830abfee1b6cf41236a0ff57b0286f82f8c4 SHA512 406144934c025d1901d9a5d9886622f0099749a5c729d4da945d7b95e1d6a3c3f4d2a2574f22bc57b3bdd03d6ef215787069524c0a9ce5ebf4cebe22539537b9
+EBUILD boto3-1.14.0.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
 EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
 EBUILD boto3-9999.ebuild 1286 BLAKE2B 5c835ede1c85a0d847b56c98e512fa34b95fe5edf01ed71eed44e0c849844a85070d03794cd57c1abde99e5f4c44e8c528ab987601ce33d426b49e20144155d3 SHA512 686f5d3e2a204b50ab55c518277ed718188aad5240e548aa31e01facaea330540cae9feb7fa5e56559af342cba6c0c09382e8805cfb6026440899c9a723221fe
-MISC metadata.xml 430 BLAKE2B e951810929d6c9a3b183f46f69241b39991b959b34ad803b5507715383b0baa6c25832e93517ba5605539c887e43334aec9ecf98c47ff8d1d976f7a7a52bb551 SHA512 2ddde38dcbdf4b70f8a52443c5e34d31fd893d5ee4ce3cc323bb9b7940b0ccc3fe557cf06b880705624f248924807356646b13815fb49d26a3247bd3c571f2c7
+MISC metadata.xml 644 BLAKE2B 6d8196f27c8ec19e9d14cd52579809b40d036bea225d9c434125ddc4c210062a141d982285a2925400a34f7698ac660257e076bfdc3c9d067264af47ddce7b9d SHA512 b1c4acf5e1c9fd16381a43801c69a497505141ef3ec3d6aed6e2cced971fd310ade4714e436beceaf5c8a0d3b556e6f67b94e3cd3d296aa793b47c1b911894ce
diff --git a/dev-python/boto3/boto3-1.12.48.ebuild b/dev-python/boto3/boto3-1.12.48.ebuild
index 1d5780433f8a..f95d58504404 100644
--- a/dev-python/boto3/boto3-1.12.48.ebuild
+++ b/dev-python/boto3/boto3-1.12.48.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/boto3/boto3-1.13.26.ebuild b/dev-python/boto3/boto3-1.13.26.ebuild
new file mode 100644
index 000000000000..f45344d9732f
--- /dev/null
+++ b/dev-python/boto3/boto3-1.13.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.16.26[${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.14.0.ebuild b/dev-python/boto3/boto3-1.14.0.ebuild
new file mode 100644
index 000000000000..062b762234a9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.17.0[${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/metadata.xml b/dev-python/boto3/metadata.xml
index 4b3b128c1eb4..245721430dee 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -9,6 +9,14 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/boto3</remote-id>
 	</upstream>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2a7e90dcc6c0..b6f9d974c32b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,14 +5,20 @@ DIST botocore-1.15.16.tar.gz 6173930 BLAKE2B 70e185faa9fa3f8537e38e4db8c263f5bfb
 DIST botocore-1.15.32.tar.gz 6261957 BLAKE2B 7825e7d6315cae3578155825e0b5cb3961e5548021d63dad1747903c8f55bede03c4fdb0a07b724e2816ef294a890e85a648bae313620ab4156fd2a28d4e517b SHA512 865612fa52aae3bf08ee74b52a3fe685d7308d0d86bd438851e0b9db639ba3f6430211a7863c1b0737c0af0afc6ba760b2ccfd0103d303e87758317f773cef6d
 DIST botocore-1.15.48.tar.gz 6336322 BLAKE2B 0d25424e82fcbf1376bb1eb9cac9eeb7a45d08698f39563f635a34b1b24bc6823c5f2b08b6a40a0fc9b54b0404b8f5dd7d07fc21e0c7e0c489fe172e7f29a936 SHA512 91d86731909be5828e38a69e32e5189fbd0357378c51a04f60efbcfbb1b6c0c01151c982fc32619e3be240f5df881e5342bbba6b290b3092d9fe11ce9e3b28d0
 DIST botocore-1.16.12.tar.gz 6422375 BLAKE2B 333cc3d42b42b93f952c6344f5196b248291d6114f3bf7e73550bfb712a8a618908acb0b08379c9caae1c8a855bd738cd5f7efeda808799510c740d604459346 SHA512 891c8c2b3b6208d3d8543c055fa48887c58c67845d46a9607ae140d3a17d5b12665cc50afa304647895c891112e35ecc1cacaf36e75d0491109bcc5150be0ec6
+DIST botocore-1.16.20.tar.gz 6442160 BLAKE2B 23ad33e53ebf810087958f003d21fe5874974e15948d26ab8c4f56ff48e7121d09d9f35dd31055bc6ceb3a2c6327a1e9fafbd6909d2d2a7222e81d9ae9a5b36c SHA512 f92cb05b7b14f3036373f5aeafc956ad776ac486343d16275075c2b29d8212859ba7f84f83865027340f7544231d4920af627e1efe194393e5aca028fddfa4c1
+DIST botocore-1.16.26.tar.gz 6458468 BLAKE2B e753f7dcb3d75a86da78536883e44cbd493fd3ff48fae86e5e1959e55d2d66fe8dcb33ee46af51b39390ce7d2227bdb193a827932b53dc5a4b56f985faeebd31 SHA512 66ba4e9bd8ae72a31fa093dc7d8eccd646a12381086f524e3bd63d6031f2d75bad5e241f08e5588a6ac6c16eac693d0410b1858641bf8e59decfb1e6ed16b360
 DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e11224addefac31b87b8ce9983350aeaaf862feaf040490fad8eb87d7dde800bd8a77156410e6a734f567e2cc1055 SHA512 1f265a0a8adb7f0172f02448d3be5aeacf11e3fb7023da8d81e6d19c39d97cac99cfe3a70997e682deb44a4fd78304e4a0c1df43787f3139bbccbe852c682a82
 DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768
+DIST botocore-1.17.0.tar.gz 6478558 BLAKE2B 761ff2d57079a52ce38a6d56639fb0771d1fc4fb6a3494badecaacd4cea1ef74a69fe23d9fe62827993a3b6c33b963a2a199300f37fa3e7dc42433135c00f035 SHA512 a43b2f99e44ef9de3cf740b8fc1d74976d9ff6831639229a704f9300011405861789c9af26ea657f64244f5d67cff19aa94f95e5d2df73ee4f2dc10ccdeabae3
 EBUILD botocore-1.12.122.ebuild 1496 BLAKE2B 99db83ccdf13386f7c3745508682fd6b3e996070917b770e23cdb5b977183c822d763355dc9dffa467fd8c45faa06a7794bd22df2a32ca3db4642d0d45630750 SHA512 b3f6629a2987d1be0f99adb92608bd58054d5556e68e5082efed002aa0a3f4b679bb1a51bcf2dbbadbadb10b0bfd7c6803ebfadc9ea792a944ffb04e425fa895
 EBUILD botocore-1.15.16.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-1.15.32.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
-EBUILD botocore-1.15.48.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
+EBUILD botocore-1.15.48.ebuild 1507 BLAKE2B 8e1f82403072c78012237af3372bac8edfab398085e42badc1cbc37ef65e969300976181b4fd3d388fea84146e5a5279e8ae3e29f65c8cb92e942ea8fd75a211 SHA512 8d0364652a3522beb6b484a02a76d034eb2d67501654fcde8072e1828d4c8bb8803b4747dee5df0c38b8190a237ebefef461a2a65c2ac19b4a1856c2568b2219
 EBUILD botocore-1.16.12.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
+EBUILD botocore-1.16.20.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
+EBUILD botocore-1.16.26.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.16.6.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-1.16.7.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
+EBUILD botocore-1.17.0.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-9999.ebuild 1614 BLAKE2B 8a4ee3e4ae8733ab493bbf390bada866cedeaa3139b501566abc3dc8b56b6816328d885c84b2d4b2effe951d178c91641934129832260f07cd0d60024cd88635 SHA512 2a1c6901db5dee864b97e92ff15ae267f58814ade23fdf13e351dbcd7e6e3ed2faa3a189bd69872f0cc1623baf0c9b975ec616f95b4ed624d0389edef98b2437
-MISC metadata.xml 591 BLAKE2B 6a056dc56e9856342e4ab55de897f825a55c6cd00b3fe478c1dc215aee97b46fce8411ad5aef24c0e226fc30ae48dfebdb32be37d412b0ea1ba6c0c955dc5e34 SHA512 5a5539b7ae374116b0b0bca5a5546be49ffbbefe95e76eb70ddbe80542dd693f599e14c46a496074c3ca675aa2b4e587fb1f1480f9c1c0cfc28c7208ebc3a897
+MISC metadata.xml 693 BLAKE2B 79fb75098be12506dd472260962bcbb2a9db5dffaa1a5237e317513f4392046b6116e3b2f9a56eda9e77f84842d2e1fb7604fe9b75808e0e36c8db02aa182597 SHA512 446695bb6e171362c741c8c5943e232acb012fa9df297637e0e41503e41b06eb3a14c0790a8a17d5b7b6f643a3e8483e04c28520cacec9ef81cf9d4344744516
diff --git a/dev-python/botocore/botocore-1.15.48.ebuild b/dev-python/botocore/botocore-1.15.48.ebuild
index f9ce3c85acf8..1c38902f7a11 100644
--- a/dev-python/botocore/botocore-1.15.48.ebuild
+++ b/dev-python/botocore/botocore-1.15.48.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.16.20.ebuild b/dev-python/botocore/botocore-1.16.20.ebuild
new file mode 100644
index 000000000000..be9914c2cdab
--- /dev/null
+++ b/dev-python/botocore/botocore-1.16.20.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+
+python_compile_all() {
+	# remove version locked deps
+	sed -r -e 's:([a-zA-Z0-9_-]+)[><|=].*:\1:' \
+		-i requirements.txt || die
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.16.26.ebuild b/dev-python/botocore/botocore-1.16.26.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.16.26.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${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.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || 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.17.0.ebuild b/dev-python/botocore/botocore-1.17.0.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${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.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || 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/metadata.xml b/dev-python/botocore/metadata.xml
index 2f4def8262fb..544a8e107e42 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -10,8 +10,12 @@
 		<name>Patrick McLean</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/botocore</remote-id>
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 8553076ec743..177c42d4fdf3 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,5 @@
 DIST bottleneck-1.2.1.tar.gz 98920 BLAKE2B 02fd35eaa15761f2008e46c459d842cdb5ad16372a03ea51a82b775ae0fbfa81beb0f1f304dcf6565956dc2d6deded579d8e400eaa250f9ab639261c085a6525 SHA512 0299eb1a12d808f18b8c4259c2205b47b34af4c1245867ab0857eb34a1aad630507cd3307a16f522db461977bd3f70aca688fb6a62ae84d1f895d18165132781
+DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
 EBUILD bottleneck-1.2.1-r1.ebuild 718 BLAKE2B ee0e29e6501d9090f1b992fe94f4ec881e31c8a9fadd2a5113f5e66960b399917ae8a4a5ccb10dbb1671812e1a2f7e359e67189843750a83626388fab97fd135 SHA512 7ff2f8adf5fcd5297f2b3e0cf9b39308a6d6228646c758b12f1bd7b032b40ea328b9ac95642d59976e19d80523aa35873a6706991daba4e6556244554e8411c9
+EBUILD bottleneck-1.3.2.ebuild 721 BLAKE2B 84db0025d4ad6bedea964e8822f55789a5f4984a5702651134305b47a719d6f3019953f7d7524165012f5da70f498c328e1781b8b05fa333ca3b45b847fc9b4c SHA512 ffaffff979c831b638a3dad4c8a46f49effc9ac96892afce981069bf717aa6921ed2f7b46a4b44d62696787be7d526937399165af00d9a18de7183e4a3278e54
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
new file mode 100644
index 000000000000..6532decb92e7
--- /dev/null
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast NumPy array functions written in Cython"
+HOMEPAGE="https://pypi.org/project/Bottleneck/"
+SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose )"
+
+python_test() {
+	${EPYTHON} ./tools/test-installed-bottleneck.py
+}
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 5c45624e3857..87d431b66920 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1,3 @@
 DIST bpython-0.19.tar.gz 216564 BLAKE2B a0b469ae28965e7926838b2d520aed0199a39ad5d9d5650e34446601e6e5f023a6c09cbdd85a30b2873dc72b5ef5774c483d5f627accaf29dce7e6f8628cc1df SHA512 7c746848671d5de0b63f0284d2af87c12480fa1ae3e89eb10093ab5dfd42f926171f29bd8bcc19fe173fc58f7eff7276da4639d580836f0d112dc5e85000dc55
-EBUILD bpython-0.19.ebuild 1487 BLAKE2B c78099c542f93af4606f439e5c12e1969ec7ccee20a197e40b6c2c6c437873700a65cbdb316f8f47b25ee7adbe98cdac0ebbc7f84e30feae9824e36b4e0f3493 SHA512 c605c91478e64c3c1bf9362d9faafda703211bfe71e37a1d0b5ad79a3f8117e3194f08bf6fb4dcfd7c2310b3f63ea8a3bb96a4e46eeb4042767962fab6409351
+EBUILD bpython-0.19.ebuild 1293 BLAKE2B 78f1b53f228bd067c3c9c8c2af79a6df96d9623f3e531a7334295f2ac54038e4ee2072d3db971bd943b325130e524c949fd116812903a47bdd781a4b4e4bfd66 SHA512 82c75f49d3b0d3edc3f46c0454a1941f13f5690faec16fc9cc76b76fd7afe8f381f7e0aed9ba746ec12dce417b0d4d24658c512aba0e40eec7c9c008f22b80ef
 MISC metadata.xml 527 BLAKE2B 2691755a7de852d518e3646b965483a12169e56dbfed6fd43961d6833d9ef673f8c0ab146a2677dcef6cfc173f3a9f2200fbb39ed870570b8f28ca641c617e60 SHA512 0710368b088d3c9bcd52c93df885a730a4a3e189781dcd1a10d63fe6dfaabb486e972150ebb693ed1859a4461aa1343bb5ccc80772406abed4e0f0f9776329be
diff --git a/dev-python/bpython/bpython-0.19.ebuild b/dev-python/bpython/bpython-0.19.ebuild
index 178c7afd56d5..9e264fef8f6c 100644
--- a/dev-python/bpython/bpython-0.19.ebuild
+++ b/dev-python/bpython/bpython-0.19.ebuild
@@ -27,31 +27,19 @@ RDEPEND="
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/watchdog[${PYTHON_USEDEP}]
 	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+# sphinx is used implicitly to build manpages
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
 
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
+distutils_enable_sphinx doc/sphinx/source --no-autodoc
+distutils_enable_tests unittest
 
-RESTRICT="test" #659110
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
+src_prepare() {
+	sed -e 's:test_exec_dunder_file:_&:' \
+		-e 's:test_exec_nonascii_file_linenums:_&:' \
+		-i bpython/test/test_args.py || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index b987b380db4b..8212a7a996c7 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
-EBUILD breathe-4.14.1.ebuild 742 BLAKE2B 47e308c0e37b4600185be79bce792c9c376426eeead098328efe64558c93c13c4df33693477a489c398d999131a5cef4fc9f2aec454c768cf02e3c93314b10ee SHA512 a4d7d4f577c61983ea3b1e4defb6290d267f1f493f53f76bb2f867a816cee2895cd96b177c683b8b8746112f361cca3eab715cb48e95f2907717d5bc6213a54e
+EBUILD breathe-4.14.1.ebuild 755 BLAKE2B 37542facf6b5519e4ae6db76471ac28fc2c5f50d26ab33648dc915e9c6f9706064c3384fe3474d05f61518d50127eeb14764811890eca5e78953388365ff0570 SHA512 81ee42a2bc2189ea0737544457469735133d0c0ef2c36f86e0e3b7bbc40e327fb497690d7acbc8428967b7b397808f8fd62026009559114fe9063c1b6d01c007
 MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
diff --git a/dev-python/breathe/breathe-4.14.1.ebuild b/dev-python/breathe/breathe-4.14.1.ebuild
index 1072a576a273..4b8274b3def1 100644
--- a/dev-python/breathe/breathe-4.14.1.ebuild
+++ b/dev-python/breathe/breathe-4.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 4261e2c16fd5..db1499cd8753 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
 EBUILD bsddb3-6.2.4.ebuild 1967 BLAKE2B e503da80c3ddb7e91c6e6628281a7099423773722e93bd8bd953d482635734048f17e9c4987d3fbea31ca42738b1b2188b71ad98c66a6e5bf5019e80cbd3e491 SHA512 57734e1c684ff30730c5b0d996e21d66d8283df43b03dc12b515c6aee203b133116986ec7045766a6e33e9d72287c7d1b8e7792642b7c652002beeb7fe54ac64
-EBUILD bsddb3-6.2.7.ebuild 1977 BLAKE2B 59c5457e5b50c93780b6e6711190950ef8b9b8ed5f147a44eb3879753a2746f2804e8e08af96e350b9185b4210a170b7e23c4f21ce596da6f0677817baeb6782 SHA512 abc4ad9f671fcdb3d7d915ed76c8c26f13c7c48b0c64eb75547cdc5966bd1fdb4688742476b3947cffdd9c9c0a1845c93efcb134074139b252d857cded4d21e9
+EBUILD bsddb3-6.2.7.ebuild 1969 BLAKE2B 9e379c989e50e21b2aa85a74b08f7735483add3669400801ad80a426ac6b8576cd3c0cc880a2694ba5634e638b7358cd8f1817fbf7b7c7ea2150f97bb6a6b0ed SHA512 95bee542ecb3634790aa99f6e3ac2d460466264224d1bd242b58c6a8da1967521b0f5ac48a21a14bf41b00c7fb54d3a0214eff93e5ebcadd53ed2b5ec4703b2f
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index d4b982c8a5e1..2636c7c14f52 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 6349aa9ed15a..aacae6bbea80 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -4,6 +4,6 @@ DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fc
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 EBUILD cairocffi-0.8.0-r1.ebuild 1142 BLAKE2B 4d5aeaf534b104e6869e25d24de9ec10df350d5fc27b0cfd624d8e1e7bf9399839bdcd63958404b27592bdf71468a534760b51fdf8273135913378c5985f04c2 SHA512 fcb08dc478ef62f2e0fb748fdb4e950f4465eb4f9ba0f0e3bd789f1d95b03f2b93a7d47cbf8ed7f15d78527959c39bf6ffbdd84271b6bdcae18c4c43d79316d8
-EBUILD cairocffi-0.9.0-r1.ebuild 1114 BLAKE2B aa6c295b033d43ccd66033ada4b767998794b32031088d7d386b1195b4da9af3d1979a5b0b4b6141d8147651f5a38948afd08ae7dc200a5d237859578cb16908 SHA512 64a5b85a396b094f3130fb81f963aea74b18ec357071c485c09b853cb35e62f10ce2b8c23b2a9cb6e683a6a02636978746a9cdb046d3f85fc8a670c360f5d972
-EBUILD cairocffi-1.1.0.ebuild 1186 BLAKE2B 7896f3801e24fdafd3e17333d96fcf4d80be02f023fb331d855ace8d66c1bd4f95a8533847e4afacb03e03325a7ddfde5c8457abd8a2069670f406534a4461b9 SHA512 f492f28424e0533681a19e2e50e7b39f54a5dbfb9203a66e1607179029003524f7d32ba43ec6bf655f821c71578530d249cc61f84df134a15d1cbc161748993d
+EBUILD cairocffi-0.9.0-r1.ebuild 1146 BLAKE2B b6f2c3a480e75ba1dea7ac544bb6a36288437b9b02b0b4a8d0bb0654f0a61305cf04ba67226aca73b270763f0dc0347a2f1d8058ca8e26772633e2041eca6564 SHA512 2551858fc4cc26cf16fe17cdb5ddb5191a7da822f479d3905b0201613eadcd9bd46f5e7a5b1b1818263d65027c64e8ca7ffdc3e48cd5384e227cbb26858e5b32
+EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
index 45e349b58087..6793e7f9b0ea 100644
--- a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
@@ -17,9 +17,11 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
+distutils_enable_sphinx docs
+
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
@@ -28,7 +30,6 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -36,15 +37,15 @@ DEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-python_compile_all() {
-	use doc && esetup.py build_sphinx
+PATCHES=( "${FILESDIR}"/${PN}-0.8.0-tests.patch )
+
+python_prepare() {
+	if python_is_python3; then
+		# Remove deprecated statements for python3
+		sed -i -e 's/tostring/tobytes/g' cairocffi/test_cairo.py || die
+	fi
 }
 
 python_test() {
 	virtx py.test -v --pyargs cairocffi -o addopts=
 }
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
index 457f63121118..29fbbca716f4 100644
--- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
@@ -3,53 +3,33 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
-MY_PN="${PN}"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
 HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+	' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
 	x11-libs/cairo:0=[X,xcb(+)]
 	x11-libs/gdk-pixbuf[jpeg]"
 
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
+distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.0-tests.patch
 	"${FILESDIR}"/${PN}-1.0.2-test-deps.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
 python_test() {
-	virtx py.test -v --pyargs cairocffi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
+	virtx pytest -vv --pyargs cairocffi
 }
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index a024c14f473e..cf45feca817c 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -2,5 +2,5 @@ AUX cangjie-1.2-cython-0.22.patch 1056 BLAKE2B d528edfc39765ce5bf89ef5778dbc600c
 DIST cangjie-1.2.tar.xz 221524 BLAKE2B 149d10c6d1806b08e1de852d7e48807bd027986188555caac1b9c1495573230341e611466563f8fc3072b2cbd6a4913646c44408c91816ce9fa0d67655796bb2 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f
 DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
 EBUILD cangjie-1.2-r1.ebuild 1028 BLAKE2B d5dc641c6637456b638ede69a88308de34e672b7306911b04a2228f82653fa92cc3e70612ff455792eb02bf55351bd530af271d17ca24202e5ece3ac57960fbf SHA512 376074f3131591a3ce7b5c2cc39b33c50db20dfdb8286e598626db7352923ee0d6b7b49726db34413435695ccb352dbcbd232f01d0dfada60bf745b69e305773
-EBUILD cangjie-1.3.ebuild 986 BLAKE2B a70ad91146c40ebc9e427b3bc002aba40e2114fcfcb30654dd2087a17d17abbdc1f78e4cb0d59f110e2882feb786bfca60ec8637dbf2b384a4311f8760e2e81a SHA512 fad4fe9d0ffd4fdf7a0e4c6c5897a6accb34cb842bb4f679f28195d23a888cf5d72c5b60615e13619ee2daa60f8724322ced2067412d8f5fee56443c9153eb44
+EBUILD cangjie-1.3.ebuild 984 BLAKE2B b8ba71fb202c2dff403be8ceb934aa24e67ed380b9a7b9e272cda5d833ede9778800fd02ea264af824ecb20a7f59b245ccca747f824938205a4b187b1fd97413 SHA512 be0d41d7ff9c5fe75ade77ef9462e6187cc39e8411fc8f40963d0d628677175eae92aace8b06769fbbaca035bbc659518344bb35aca189070f98b12819ec7fd1
 MISC metadata.xml 318 BLAKE2B 7ec0867350c50e5dd8bb12e583f3b9fd3d396922facfd592bed942cb6c082ecd6e61a8b80c124bc6f092ecf9a8f1888f2e36165d862b246737c5387ed53bc59e SHA512 052a2ca9b301c41b76960284f760443dff543294b9a8d13de4c2454747e61a2d85e317a1ce08b224442c50822d0a39916aa897ba63c31b4707ebf667fd5ae70f
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3.ebuild
index 96769343a7e8..61b243fd4fdf 100644
--- a/dev-python/cangjie/cangjie-1.3.ebuild
+++ b/dev-python/cangjie/cangjie-1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.t
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index 44e38d55cb8b..f5ccecb52013 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,3 +1,3 @@
 DIST capturer-2.4.tar.gz 16963 BLAKE2B 329e388059a033993cf2ac3744a8df273beea0239f3696d19aece57767b0b5cd3397fa095f860c4f00ef24e8cd6bf2e58aab4158a86cf8c0c09c89d2065de0da SHA512 d85614b0424ab8817df9475ac0d230d7151289a3353a3c043a7fa89dac0528265a4dee535cac9ad0a3c2fbb0cac18afa69cd0a405b1becab55f9a6be13df0c46
-EBUILD capturer-2.4.ebuild 733 BLAKE2B 3b2e407c6e1e842fc213ace6280469745431f2371cb29171f88f09dd0b8873a604a5b9105eb1d6cd4db8891abd825b3802071675413a200d497a84ae1d039125 SHA512 24945b44f640b340b573b180dc3c64057b33e7f59b201e0c16a1a10617a21cc16759b1f16bb7c25149bd6b29f325a21d29598cef8bbd2fa928cfc36db93813fc
+EBUILD capturer-2.4.ebuild 738 BLAKE2B 2755052a169fe6c3f5c2741198c5f44f538bdbdadb2f6ee9ebc8cfb92813afe684ddaf12d7b2c61f4eb677b52a655c4df65cb687ede328b8cf3e3a3a53ff450e SHA512 14fbd0716ae21a0685c38fc7d520cf1c1bd90698f81c59cee7e53b4b9f65beb0c76a60a131c7bd9a0063ff50525519abc6172c9d100ce46a36242342d2fc074b
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/capturer/capturer-2.4.ebuild b/dev-python/capturer/capturer-2.4.ebuild
index a9537b2a2226..2fddeae9f02f 100644
--- a/dev-python/capturer/capturer-2.4.ebuild
+++ b/dev-python/capturer/capturer-2.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index a728fa771c5f..5e9c05ecd7af 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -2,5 +2,5 @@ AUX chai-1.1.2-drop-Python2.patch 915 BLAKE2B df25014f5b067205d3506d420c0dc4925e
 DIST chai-1.1.1.tar.gz 81684 BLAKE2B 0aa285d3545e445f26f0b088c1b721f2dd14094a8f499cf7b2dde378a20ee15e376e43a91a664be9d6bd11b45d9c2f4606ce5de73743c27b6bb76e9bea409194 SHA512 f51406258327d9a49e820f0489d60e87f576c72232c701e99f96945932ed300582e6dd81608e5b262e2645c4e9c5216ec8f52e98d454c994beac8d1d8137dc87
 DIST chai-1.1.2.tar.gz 107807 BLAKE2B 6cedd108f7275c3dd03167c7ad49695d95c27e1b0c752247e170996f001c7690cede7c7ac8de8e374077ea9802534b8386b0bd2da7197f0a47085ad9f9e470fc SHA512 81191b11a8c5c6bd1fbb0c43fe7855d6e6d9be54b4d0ddc42582a23b9df03249a91ba8ca50b5b74e76aab73a101377624e041b6c47ea6cba5267d4b58eaf77e5
 EBUILD chai-1.1.1.ebuild 523 BLAKE2B 7e5b3051c6e808129a34533835b61a2afa045a6aac3702354762a2fb4cda00f39963d193e5e13a5e295185c360dbbecb0fec771cb738238968ae5457d0bd1d87 SHA512 e0bf2c4ecd8eeaa00e2c1614a12e5c2767d2d2b5876e3747b05e443e3c676b50c68645e1c6847a19816380afb761df5e8a37ac01c3923f772e468fb92fb4ab2b
-EBUILD chai-1.1.2.ebuild 466 BLAKE2B b39b9dd2a30f2b5688cbe5e7050d7bd1bbb261e3c0bc8fa27df00152455bdfccb85330eeecf206afb2a4c6627e9b6cf06518cb3fbd51634129fa5d7e39649ead SHA512 d550d0d6868a39cdfda0c19a3b8069387be270fbd407f1d62fe85631701fe53518025d0523e396bdb8ada1535c5c01d08a89eaf085eeb3c72dee28ecd8bf268e
+EBUILD chai-1.1.2.ebuild 464 BLAKE2B 2bfa9f004c62fecb64c53032bf4dfb72ad1ce49eec2dae9cd52888690a3264c959078c4059ad988279d22d2feeed0903616e2f4d0a3312761b6eca1a11cff53a SHA512 c2b7ce169f265a1aee7ba99c5e3993cc4a6cad8abab82223645fb6ef1f3a3743304957321d5bf7a6f5bb482db2edc54a6e3b0cd8fad0c7eef71417b606cb2131
 MISC metadata.xml 362 BLAKE2B 50f7aa3c56d7e09aed14029e4b52d3a1e5b765423e86b5e9df00d11f0b2d12f45b07334e64c1ac01854bcc673ab183e491298bc91537054bd4f3df3a014c5867 SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176
diff --git a/dev-python/chai/chai-1.1.2.ebuild b/dev-python/chai/chai-1.1.2.ebuild
index f031b5fb0dd8..ff8160b56f25 100644
--- a/dev-python/chai/chai-1.1.2.ebuild
+++ b/dev-python/chai/chai-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 PATCHES=( "${FILESDIR}"/${P}-drop-Python2.patch )
 
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 7c7c5e2da151..88fb3e3169a8 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,5 +1,7 @@
 DIST chameleon-3.7.0.gh.tar.gz 135209 BLAKE2B 14e890eca1a3c211dfb5a658457473b21948b6f252e76e5391e862850a29e9e0fe4aaa31a03da7ec1674a2b563d083ee31fb342be2dc9bf4e7b4dbccbabf8637 SHA512 9f1d2a9222b795ac139f0c06ea8169ec132c00714ec4608e58dd5781dba8380f988141f6659c47e8920ee0cd4d4bcde9070794cd0e2b5f34d0fce21d24e2dc98
 DIST chameleon-3.7.1.gh.tar.gz 135230 BLAKE2B f0bd4dd90f7ea976e96101c2937f0ae5db110531caf28890042d0cd7a628489f03f9e2e3eed16dea2981ebb6e064a53adf95638102dfde6c8218e41e0473b32d SHA512 158b418fa6fbd13cd48d913ab34fb4f16450aa0fa3b382c6c829efed3100753814449a1d4004c9bc45d327d2a66130db0518b9c28943af300b4b310e955c426c
+DIST chameleon-3.7.2.gh.tar.gz 135311 BLAKE2B da6803bc6c064151b9d0cbe7761bbb44f73b1fd24fcf77d2e906c410768a1c99fa04225ae4aa719282bbb1f4fd0d51a6c710901016bb5c24f78ba2184f978f27 SHA512 3025fa92bdff3279fc404ad08d73d46bee82afd421f1d81982bd5cd2ea3fdffadf22efdb8b66157dbdf4d0cd793ac06b1a0daac4eb17a2a1ce9f14a65d4a6f8d
 EBUILD chameleon-3.7.0.ebuild 487 BLAKE2B b4bfce3c5bbcc2bf1499a36ce44295bcdb3f138b919192fea523e353747d291ee7c030f208642b1f7df7603e892fa0592d0c7c2c94e2ce0c8f232773df9ca073 SHA512 99e480305dd8870980bac8b4ccd2cca4eddb1d0b09d33810f9406d06dad42af6e51037d732fdb8b8abf4941b7f75d2121abeeab7bd7e1aff32dfff6a5662fcf2
 EBUILD chameleon-3.7.1.ebuild 489 BLAKE2B c13e3c34a531fb9154e0675285ca97ae1f8b0d13bc76d594ff31a2e9e8f67b035bf1b1ea91730f858952e43df9866618649aa537d8ab3863080e02712bb9d77d SHA512 b6afcef7a6e86273894e0588c9bc83102366137bdfd872ec40fa087228ec5efc47980130aea0e33ea7150efc8fc8b7451b2c66225287326776f7f9e3dd06a52b
+EBUILD chameleon-3.7.2.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-3.7.2.ebuild b/dev-python/chameleon/chameleon-3.7.2.ebuild
new file mode 100644
index 000000000000..6f8ba1fc5c20
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.7.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="https://github.com/malthe/chameleon
+	https://pypi.org/project/Chameleon/"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index df3783552418..dbb17b5f8581 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -5,6 +5,6 @@ DIST CherryPy-18.5.0.tar.gz 685362 BLAKE2B 36178ff6e374a89aa4fba9ba34947f1558a7b
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
 EBUILD cherrypy-13.1.0-r1.ebuild 1323 BLAKE2B 2d56bf87bf3b6179eec66a8b02c66f98f35c3c129fed2a31cdcc4163faa2658bcc53b72284ae0b82cca529b9abbb7677f9964241808047bd22d712cc77329eea SHA512 a53f1c3734d389d784ac49419f289bda1b8576f6d066c0b5d0c80aa0075ab2587874e875121882337938cf799af2415681976e8c1960e49de6bab2d9799c5f89
 EBUILD cherrypy-18.1.0-r1.ebuild 1875 BLAKE2B 006810caffb17f6ca1e90384737b96f3ec8a3448e6207db25f410d2f6c0197b2b27e2fe257b25f2391df75ff7b998ef4cc4fcd00b3e84e2b5bbf3c62cdbdf8e6 SHA512 23ca6415d721afe790e458efe1aa79045f6368fa8edf2d48b84bc7d73dbd88b2ecb836a38e89e5445368f1c7291c7d640a702468cdde1fa4bb5dfe0e5e88adef
-EBUILD cherrypy-18.5.0.ebuild 1840 BLAKE2B a998dbce3146cd784b098ee9d4d93e858c1075164bca444a2eee4f19e180770b5ef420afd2321aabbdc6278c9246fc1529cf0254618c5797d1a52a50316cc0b8 SHA512 313b07f8c2b89987150acd6d59ca9afa832197db9a9c05c36ed73a58a8f552c5bea4e879cc25a7a0fffb7067754e0b6eb45cd55d472dcf9b6d77762d8695c89a
+EBUILD cherrypy-18.5.0.ebuild 1856 BLAKE2B 6e3112f30907716e2cdebf0366225a536395c882638598cc06ae1812a144f9b8772f6e69af9c05d9ad7b2b39daced0cfd4fd4916e7211f03365a0cbc880276ad SHA512 107dbbf52c8cc60bebf2cb9da1c12c001cb1825f66e332378fbf9988de379cb78b014f0c4bbabe9675fa849ab87e76a151ada0c0154bf11f679c8526380007bf
 EBUILD cherrypy-3.8.0.ebuild 1639 BLAKE2B 404e81cf1f8e8752663409c02e3aad85d3e0088a6af5238fc745cf96fb81070ffb355a06d08e458a9de66f2d1753ebf753b6bc974b3972b7acc582d80b88d876 SHA512 3dbb263af36b1243536446022750e8f30f4bc629cee442bd39263d3d86658fe3aade5094929a469a43bca44cdca4bcbf92312e3f5f9a4d72f0688653553642df
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
index 2000122fb0bd..7d90d9a6bf26 100644
--- a/dev-python/cherrypy/cherrypy-18.5.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="ssl test"
 
 RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 0ecad2bdce68..9c1385334520 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 617 BLAKE2B 14a3fa634d87c32824c2e86b09301a5e3cf1770413b8c0ad83758596527b1c1d12ca25c78d055e1bc78ea4881a0f39efa9fbb659807ce9bff9ab79829329a15b SHA512 3feb6c008bae45b2c938c38049fd8d95e229dc6d6f29b8ebefb17740cbc3fe2d5ae4c7ccb25a966dd29137a8096f5532566f5fd351e8d94ecdacb41f5b0e55c9
+EBUILD click-default-group-1.2.2.ebuild 635 BLAKE2B 5aec16896106ba8504b1cf63758dffbc4b112443c62d2250acccaed1e6d6d5e69261733a66d032266f76f93882ac6a653db4a03110ceda9492775445a18ba618 SHA512 032c0a29d680bea4cb25d03e8bea65226d5e13ba5bc97959df5f668cbf6395fb24e2ba46a7cc38a9b69bc820c52d1aa8f4178c72c42fa527a92facc6eae06ff3
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index 27cf287634d8..53e65996a52e 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index eb74746dd2d8..c4eac577e47b 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
-EBUILD click-plugins-1.0.3.ebuild 505 BLAKE2B a16018c8b8cf0385accbd10b2505579f59f4e7b3cbbd379be583a328cbabccef95c78f1fc8f51503c1ca52734103382eb893a1bf77d3e62b06ac135e308dbce2 SHA512 e9d429a1937814a46b3a398c539e3ac5994f5821789c5507080da386d8518dc95d2a955ee6cc3ba5cb23405b163ba90aadd9ebd7191e38a1355528a52f0907ff
+DIST click-plugins-1.1.1.tar.gz 8164 BLAKE2B 48d75b9445b72dca41516fe81d02c6fad8089630c0d49963f559a847b90c7897c8db64773c4ec5f4c162d0f2f4fdd14fe212d485765d38977145fd32acdd0dcb SHA512 bbd838f50603ac4e76daf3535fd5d27a17e17549addbc8b582df6d6193b4f07d743101ce52f0b71f326995fdfeac159805025770350ca2e7697f212dce0c4b1a
+EBUILD click-plugins-1.0.3.ebuild 512 BLAKE2B 712326c229d3d0aace82ca6f131be36830d3bf577eabdbfe6f9d519b0d31380766df54459d148ae8fb8d18a9bd160cc82e4dfe246170dc11cf050aaee6c10a95 SHA512 8e7c94c94ded1e7be78b49fe606b04c72137b4cbfc28f12a0a2f974f0df31d70dc7d0f1d58be45427b102ad61ade55bc29ca94f9156c9315807f07c1e81e893c
+EBUILD click-plugins-1.1.1.ebuild 541 BLAKE2B 5a519c2f32e411920fc627fb05f482dfbb5b3aad205849a6e7ab0b4f592726103ae1dde54e6f3fb8007b461d297c55550aff65880a4b283d5e7485a88129271c SHA512 27ee7929d8e46e66f4e12db74b33036c0c5d5838b28fd4fa56c966f298fd8d2ac5bec46c7d950dc3b5afc931f983353ec5eab6d9959f367a4ce590eafedb05f6
 MISC metadata.xml 248 BLAKE2B db670c3ae382b7098d9d12959aadf4e3adc1e8d9ca4960e6966b63b88a179376cc32540952c9ad5835e5c41f0c8937c383da2ba2d079d78a868b3274bca00330 SHA512 a16675a6c8b0afce6dfc3591b8c30b89454b6a8aece3431d396a0cf0b32d5e19f529e3e514130881657bbd079347cdc1fc9e8ac5fadc07c3dae3cfaec1ad0bbe
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 0e9e0640deef..118d84f95fe3 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/click-plugins/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/click-plugins/click-plugins-1.1.1.ebuild b/dev-python/click-plugins/click-plugins-1.1.1.ebuild
new file mode 100644
index 000000000000..43be1f4ebd57
--- /dev/null
+++ b/dev-python/click-plugins/click-plugins-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# 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="Module for click to enable registering CLI commands via setuptools entry-points"
+HOMEPAGE="https://github.com/click-contrib/click-plugins"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index d6d87f13a6f8..ff40d9be1e3e 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,7 @@
 DIST cliff-2.18.0.tar.gz 77905 BLAKE2B e371c4025fd3bf0543d3f4f038ff891a27f8116d3c833a2ded4e9f619879501868c3acf9e2f1c36023b79da404dcb69f8a8c31fbbbc2847b6c7dfabbd7ad666e SHA512 0748f8f392b11ceaa63f516860f6a339a9bc1233134562b13384bcbaff0b9e84e82a1544658ea3bf9c0fde973c563bfa1e92cc418a2fef0bfdced3f88d93058f
-EBUILD cliff-2.18.0-r1.ebuild 1857 BLAKE2B 9c79554eb4809abfbdaf53da8d22a7dc5268ee63c1dd09538dc3035e69b5dad09afc224464e29eb32f5dbcefb2dd5ee877b833c203c319e3de43bdd7c8d30766 SHA512 9ff2ea2a040fe27da714c55d1a2b5c01f1802259a7d3de92cbe3889c3afefaca2557c45996f5dc44eabf152c3b55a243cfda156435f880fb033ee82720436e4b
+DIST cliff-3.1.0.tar.gz 79037 BLAKE2B ab7fd085a222d93deab2d97649be45510f868c7b6ffc32bca6a6cfd7c6c66033f831fa5682d753d8111ce869d94c788c204610851034fdd020f829889062a066 SHA512 f6b74a91e75a0715949a245816f60563c78aa23b03f896240650a190b9d9486e0079081f3fb12acc8aa610c411c7571a330a94f2884ec00b6f893a0d9bebdcd4
+DIST cliff-3.2.0.tar.gz 78613 BLAKE2B 0d6a253b026142a91f70cc8af8041dbbef6854b86c36fac7fbe0929c9a13742aab7be8a26c1419947e6eea550ee3b6bb2985c92bdbfe7b76cb3fbab7fc82e56d SHA512 dfae68bb3ef66a562e9bbb0f15bed61f144d7be92eab0553d01dcf7c7349c8e41ef51f98c3a43997cda09031c08db6db1add643ecd6a9fd4d27ddd61f87233d5
+EBUILD cliff-2.18.0-r1.ebuild 1864 BLAKE2B 3d759bb8ccf4659e1699165a877c2eb596c318864576ccaa562c491061a0cfecb0445ca27bce9e38a4d41ca1d8c2e1a27fd67a6a14157aa0a43738b1f731cf17 SHA512 a4701406573674a09b2b1e95a7f03b0e3be5fa57be29edba7ac4f143c9adcfff68c73b95bc1151eea7b3537deab7cbbcbec2624e1c97743d43321cdcef66144f
+EBUILD cliff-3.1.0.ebuild 1043 BLAKE2B 1ba363c755b8c72e5edb5dd3ecb048ea4e2136c97c14e956262692d5cb05cfa31e7c62c8d52f5f380bc03ec761501b3bba6445a6aa78fbdf8d86cf0b9e169c7e SHA512 84428b3f44dc2830fac937cb5441b160dc16d730908e46a096148828a715fcf25e0fc293033aa6382a298ab1aa289b608c984bdfb2f0cd228713cc7fe1cb426b
+EBUILD cliff-3.2.0.ebuild 999 BLAKE2B 9467a5a29e1796e66c34a0fee637eb57de78ed78ce561819e8b3a60074f292ba55cfe25458a96802e66091d17a725d15f045456ca5bb5bbe3ebe8eba0147360b SHA512 d6c7a0a2ea053936f6e134067c1b65c10f22f5afbf1ecf754f67161965bd27e2b6cd93737b683c656169a3ec8b25ee1190f0c21998f7bb33126e2299a142f04b
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-2.18.0-r1.ebuild b/dev-python/cliff/cliff-2.18.0-r1.ebuild
index cb610d2594f9..41dccd095b23 100644
--- a/dev-python/cliff/cliff-2.18.0-r1.ebuild
+++ b/dev-python/cliff/cliff-2.18.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cliff/cliff-3.1.0.ebuild b/dev-python/cliff/cliff-3.1.0.ebuild
new file mode 100644
index 000000000000..3c74f32631a1
--- /dev/null
+++ b/dev-python/cliff/cliff-3.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0
+	test? (
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.2.0.ebuild b/dev-python/cliff/cliff-3.2.0.ebuild
new file mode 100644
index 000000000000..a7fef18e7137
--- /dev/null
+++ b/dev-python/cliff/cliff-3.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0
+	test? (
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index d9582e3c2072..ed4ca9e27977 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,7 @@
 DIST cmd2-0.10.1.tar.gz 574301 BLAKE2B f97a60cfeb6f3ba411e64f1f8bc7d51cbefbdc7821764b3a0d65e83d1ec7158f8e585f0585ec6798472b35cb3533f3a35b9113d531d657fc6abd116fe905f75b SHA512 b7cb5b6c191ead56af3b83b19400440f0313b70568a1c838ca3f7d96c9312c36660dee42ae6e59db460afef99366498931f379d75d8a5d0860aff300c0a53380
 DIST cmd2-1.0.2.tar.gz 580329 BLAKE2B 38ab275d651849a5d609bb5e9848eb5b2fd52a88ce121311889909348448809e6b23aa26ad3e170ef97029f25b24794a33976b029928a2fe65c21e6d2f3cad29 SHA512 547757724987cc310daf60595f2c07e7355c4b35007d3ce9fa52c4dc5e83e1b27a7f646ff161cf7d2aac76a396f3ecbac3a738c09f1c01804d513b40e0c0fdfd
-EBUILD cmd2-0.10.1.ebuild 1018 BLAKE2B 48a383ea9078354d673e3d0b167c8a16085eff997d1a4c5866b348a333290a362e71f35704c523b8629f25f91cbec73fd7637cdfe84eb449defd651d91bc3340 SHA512 880ad71dbbbc7004bd98fd78461347676925d0bff3d9d775b92fd319a5628b50583305b7b1abc7d4918ce42b028807520f4179ed89f37fe8fdbca5b237782134
-EBUILD cmd2-1.0.2.ebuild 1030 BLAKE2B 0cd40bd59bf54de67250c528795963806d5e2025ea763d321ed7a24eab74064508ae082a791427457d5056a7143b40d537e3c2e06e84d7eee008d9887cf22eb4 SHA512 dc95a1571be8b90f652a22dedbdc5202980618245d93547f525dd5b9b7c22a434f361686f645123cbfbbdc99038c1c6aa71bf077e4d7d110bee8d907d237cb75
+DIST cmd2-1.1.0.tar.gz 605311 BLAKE2B 0816c3975b45c4845f234a746037319213af8860ea8996b6d05e2412e26649be6770d21dab330387037f6284b1f440a29b727c1ac4fed969fc8dbb2f9ac389be SHA512 b8065ec217a588725eb1787d2aedac8c49b8b8196c12848038f91cba73f23e960fbfe5d4b8631b2a57eb1aeaa1a206683b8b71545c1171d6d3101f03fefc0f0b
+EBUILD cmd2-0.10.1.ebuild 1017 BLAKE2B 13f997a9f9782fd3bb1ba1290f9eb563ebea97dcf82bf68a39e333bde66c3ccd894b70c46c2a88d7bc811a0f5e6cba364b386a75db9ebf5379a772530b116d37 SHA512 bf5c6dfc2378c97f93b4f53bc6bc0db59fbd9ddd632683ccad07fc1b8ff301809ee6f2bcc01c87d2953339d064425e8aa4aafc5f81ac36c44191d83ff02d7ec3
+EBUILD cmd2-1.0.2.ebuild 1136 BLAKE2B 48405c71a3be4f53fd60e9df2617c649b986f4f47578386f6bac8132f1a76760a8f4d820a2690ef615c406ea847000d374002f93408452b707c464413bd22bca SHA512 a22251a8f274a414e34d1d880491ab78f5d6a0a8e25f3bd3d628c31c8228d7b6e57b384e075a86c44cbd851b1b2284d8cc13bb7552f30187723379af1de397b2
+EBUILD cmd2-1.1.0.ebuild 1136 BLAKE2B 48405c71a3be4f53fd60e9df2617c649b986f4f47578386f6bac8132f1a76760a8f4d820a2690ef615c406ea847000d374002f93408452b707c464413bd22bca SHA512 a22251a8f274a414e34d1d880491ab78f5d6a0a8e25f3bd3d628c31c8228d7b6e57b384e075a86c44cbd851b1b2284d8cc13bb7552f30187723379af1de397b2
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-0.10.1.ebuild b/dev-python/cmd2/cmd2-0.10.1.ebuild
index c6dd48a3be49..e4ce45c0ea6b 100644
--- a/dev-python/cmd2/cmd2-0.10.1.ebuild
+++ b/dev-python/cmd2/cmd2-0.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/cmd2/cmd2-1.0.2.ebuild b/dev-python/cmd2/cmd2-1.0.2.ebuild
index 99a2e630f668..0a10ae6eda41 100644
--- a/dev-python/cmd2/cmd2-1.0.2.ebuild
+++ b/dev-python/cmd2/cmd2-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -38,3 +38,8 @@ src_test() {
 	local -x COLUMNS=80
 	virtx distutils-r1_src_test
 }
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/cmd2/cmd2-1.1.0.ebuild b/dev-python/cmd2/cmd2-1.1.0.ebuild
new file mode 100644
index 000000000000..0a10ae6eda41
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index 9419b04b2ade..b5fb92681a4a 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,5 +1,5 @@
 DIST colorama-0.4.1.github.tar.gz 104708 BLAKE2B 625c6ff325ff0de8113c5c9abe9dd296eb614b0483a2dce59b163431ec4ef1992073719160143b68e76d3ad77f77b975a110ce19496be1d8f6ee90b3f66b6e7b SHA512 006069859ca05ec8a6808860ca73ab541b246e6e6443b1bc8426973beaa5268660b48994f21edb6492fe97c4b9d29949b874b861ec200b1756d40e8abda8dee0
 DIST colorama-0.4.3.github.tar.gz 107251 BLAKE2B e09e92171b6ea4b3db4801feaf794e9aeb4f2b3e57079907911cbb909167b192eb857f0b404fa45673bee3bc02c122326bd05091846755d7dbfd990a74c60a24 SHA512 ab41a2f95fe75de0b280c174c6166b86645e5cc675dcedf784fe15170aae630e831370527c9490342b77c7d088a023a48428a519b52ad1c70be58904742a94c8
 EBUILD colorama-0.4.1.ebuild 1136 BLAKE2B 274f75102c2ca35ba404ef9549f77f9f638fdfae0fe62c8017e5d7fb1f85ffde9f2a066bc3591e29db524bf83431d4852bae4b92bd21ae6f9463d88c1e6868e9 SHA512 ef0bf186f541d78029058dae399b0273ef5ebb8573a213b7d0ae6d525ecc037607f57d72462a2c9e3471b6999b3df553fd6518e61cbeb347175b6bad47c8f3ca
-EBUILD colorama-0.4.3.ebuild 1134 BLAKE2B a58e75637a350f58b50da78d51bfea40f6eed6f85c340d53e2508887522ea1b8b06403fc6a7a7ed238d834bd651f4192c23ba9ce9f8fab336d44d774272b4b15 SHA512 73e7f4211464ce7bfcdfbca49dd967482fbc62ed9c3c44db337a1e8249fa9bc8fc1475a4db8d056e9b86130376d882bdb4f9acb18c167a9df453056400bc767e
+EBUILD colorama-0.4.3.ebuild 1133 BLAKE2B c2bac349a26903e8602ce7ecd085923f68598eaa9a4311d31c624a6845fb6ff80ad704d0cae65118653dc4cc52fa97500c78d895c155cd7e3ecefc0d0c443975 SHA512 127a1da44f83d5d6e449507abf0027d83b175b82cacb6334ff4dd1a36d9c3bbace5274c0bdb46dbc4c88b4f2c44118e89f8503aec841b50189dbc280099d8d34
 MISC metadata.xml 525 BLAKE2B ae9c4e561fa86ce37c1bc26140f3dd4267c37591df64060b0c355a78f566b0453d6f923dc6de0e92595bc4f932bbaa58a823c2c9b62f9b8ec3f38cd1730a067a SHA512 19e73cbbef7d9ee826eb4df24a23f1d1896e294209fec9a1a854e174b83aa7a948b3128a3a70db3f406aeb577b9b500f80f41d544baf053ff4460bf2e5cc2646
diff --git a/dev-python/colorama/colorama-0.4.3.ebuild b/dev-python/colorama/colorama-0.4.3.ebuild
index f59dbf44d947..3756d4cce508 100644
--- a/dev-python/colorama/colorama-0.4.3.ebuild
+++ b/dev-python/colorama/colorama-0.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 6a6c48f577fe..96ad80a2194a 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,4 +1,4 @@
 AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
 DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
-EBUILD colorclass-2.2.0-r1.ebuild 622 BLAKE2B 38d9bd4cb51d4e1346577ad136300788f63108401491de2f47ba5d75afc023c2777150e7842b1305a0986028302208f6b1224725ca446711ff378f7be1fabef3 SHA512 1101ff01eae4086014f5c33d70751b93f2a86b54b3d99337530b95068052ff536f119da1fbc22fc57a79508c4b4502fadefdcf8f7cddc5b78390970dc4a6e753
+EBUILD colorclass-2.2.0-r1.ebuild 620 BLAKE2B 312fadfa35097176879781993631d63f52a0fad66873ff5b2516c076430d9e4d077f80dfed76a85b515442243d72e6466350978733009c5134498f3ee25e6fc6 SHA512 df66d53665b2aeb8c050ee6ac5be361b1af86eda761efff871bff7e3169c7cd650247ae5a09eb283c0acd4f66b6257c59d7b076c3e66ee40e045e5447eaba768
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
index 7b94fbd13433..1cb6eb341269 100644
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Robpol86/colorclass/archive/v${PV}.tar.gz -> ${P}.gh
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index 316cfff99cfd..d8c17974828f 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,5 +1,4 @@
 AUX coloredlogs-10.0-skip-sandbox-violation-tests.patch 5312 BLAKE2B bb7ac55706ca89a16d7727d796e586a665730d25f1cb69aa833b24082e42f0f5aed3a5d4f627e2015bb189ea3422ab1bcc2982933a7a123990adf821a7a2fdc2 SHA512 071ac2255ce9e6e4e379065ce377e86c3ebc9e910951d647cd19e15431983cb966eba7e1bb2a2431ecb91aa09f3802a5e365683a2e545e0e5fb2d58432748bfc
-AUX coloredlogs-2.0-skip-cli-test.patch 842 BLAKE2B b6e17539f22349bcd20ba4ec64f03dd2e8e291e7f8e892765cc675d88b338d64f5df12b28b1909d0554eb42bfc70cc564f603d026f05e2ca4fe0952b6021af91 SHA512 98e5e8d207de67abf22d0de5729cf6926802329e1a32977dc95155490cf32c6b94b69f8e78a410a718bae073e4d6d618c515dcd7318b057671bb91fcf84c4424
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
-EBUILD coloredlogs-10.0.ebuild 968 BLAKE2B e13edd601efe9c4d301706fd74a703476181f2d90f66225cb3dbc84de425f36f1a845ea9401a02e821a96ebd803ea3680e00af011faacbb8496b237ac99bfebf SHA512 cfbcbf80a0c0534e97cd30b99ba728d5c3e05847f2a8588fc8c2f4177bedfb54b1808922d32a600654ba2b9151f1c12ae64c5c5d5e9d08edd660f2e57399d442
+EBUILD coloredlogs-10.0.ebuild 973 BLAKE2B 4b4a9a736ee0a943b153b62e5b83c380f16c251bdb00be5bcb546a044c22f4d0c2978bda0b7835095daadcb389f189da0ebe074fe787e99bca319082690d67a2 SHA512 781543a8f486c50554f1270d18ff5c393396dcbd94608c17a75ee8d2ba0aafc95b539df42ffcd1bbe018030996699495e5820da8dc48b41afb3009d5fa7f04c8
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/coloredlogs/coloredlogs-10.0.ebuild b/dev-python/coloredlogs/coloredlogs-10.0.ebuild
index 6c4a97d80c70..04f2dc1c7d46 100644
--- a/dev-python/coloredlogs/coloredlogs-10.0.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
deleted file mode 100644
index cacd016159e9..000000000000
--- a/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- coloredlogs/tests.py | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
-index 2010b12..7ab18a8 100644
---- a/coloredlogs/tests.py
-+++ b/coloredlogs/tests.py
-@@ -160,12 +160,6 @@ class ColoredLogsTestCase(unittest.TestCase):
-         for name in 'debug', 'info', 'warning', 'error', 'critical':
-             assert name.upper() in output
- 
--    def test_cli_conversion(self):
--        """Test the command line HTML conversion."""
--        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
--        # Make sure the output is encoded as HTML.
--        assert '<span' in output
--
-     def test_implicit_usage_message(self):
-         """Test that the usage message is shown when no actions are given."""
-         assert 'Usage:' in main('coloredlogs', capture=True)
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
index a38253d344a2..71d6728fb3fe 100644
--- a/dev-python/colorspacious/Manifest
+++ b/dev-python/colorspacious/Manifest
@@ -1,5 +1,5 @@
 DIST colorspacious-1.1.0.zip 698745 BLAKE2B 3d6ebf9b76b727a982829fb0e3012507e30524662110628d8bc164bad4581baf147cdf4d6c8d54a52420d3e72497ac547f98f1d162b178ac20e8e9c926d41bd3 SHA512 b4267cab679d581f2072f5a315aeccd78cc68e325e16f14675cb17133cd411a28f376f150aee7822e1568b84571d5d149adff10e9c5a7fd9f41927153967e2ef
 DIST colorspacious-1.1.2.tar.gz 688573 BLAKE2B 85b4c24a0d0ce42817060be9dfeaa00f1775f656590cc76fd5c0ce0f929b165cd1239b33a54d7d5a4969ecf7240c3b9c3fdf067ab8282052768f4f8ad6f04a02 SHA512 a5c212c82f4a8eb1561f3ff86effeb0c1edb80fca3657dc62336c56de3c8810c44288022223a6089f9eb2cad8d3bcd9c8222014c106b8915c0c6d8b7df0c353a
 EBUILD colorspacious-1.1.0.ebuild 684 BLAKE2B f0ea88ef88b3b3b32108ddd6f67604b68475d7c47191b9b1190d920852c866bcc1544528d0b6958ec167658153a9344aa3184c2007807400226c33b794a24878 SHA512 8fc33e5ab9f1821491cc6f32fd41df006e8a78e36169e71e4eaa348fbb0f3a5800c31a5a09800e89c934c1f2d916de1b5e6796465e39a9f0246646a6896cf199
-EBUILD colorspacious-1.1.2.ebuild 692 BLAKE2B e6ab2df1f4b3d76288305fee5192ea537b40a921caadef1d2542a5b17f46b58ee42bf50a85db8fcc4f16d3bcdc2aadd11bb58dced83624114c895a969139674b SHA512 33822ef0968187193d0ee40267786b370e64a58044fb0b8ce8013258baa6854ba64ff8e844f6041bbc0b3432f068a74dd25dd7e7abd11d0a0bb2b9a0a4c1415e
+EBUILD colorspacious-1.1.2.ebuild 600 BLAKE2B 08c00f2f4180764fe299a71542c72eed4da1a96a5e6c82f365cf6b9d3afc093a7af6919bdf630f376f829d3cd6d54ba676fa4462ccf1d23722ea84978967e191 SHA512 2b10e4aff1ba1376cb849fdf85cb9e996857f901512ea346ae779c86706281e2808ddd3728166226c99c735bf201c66b78046131fb1232c09b3f97425ee2be47
 MISC metadata.xml 377 BLAKE2B cb7c86d4c3ae646535ea9bd34ab9b1102227fb900472740734d9e35d18115d4f255cdfa146e9c74c5d1907c0ec3682b01cf72e2a5b6428e2a4eac94ad6854f3e SHA512 5dc4640a370df69368d6d731b54693c4a7f1b2d7b155dbbef2bcc0e8ac4a153d05b4b2a43e6410750a3dfedd15752b3470b023d7b9106eb78ca64bd3a73059e1
diff --git a/dev-python/colorspacious/colorspacious-1.1.2.ebuild b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
index ee8f6811f475..7b95376ce7aa 100644
--- a/dev-python/colorspacious/colorspacious-1.1.2.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Powerful, accurate, and easy-to-use Python library for colorspace conversions"
@@ -12,14 +12,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests nose
 
 python_test() {
 	nosetests -v --all-modules || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/contextvars/Manifest b/dev-python/contextvars/Manifest
index 14cc5eaeb674..a227fcbb7e19 100644
--- a/dev-python/contextvars/Manifest
+++ b/dev-python/contextvars/Manifest
@@ -1,3 +1,3 @@
 DIST contextvars-2.4.tar.gz 9253 BLAKE2B b46466e44f836561024b69bd648613654336a41f964ced77ab29e2fa20b43b19f0c6b5b72d31ccf208c8b74ad54fa1898ac1c09b24b124ec53a5970019910553 SHA512 391c12f163854a21d6422afd9464e8896c02b5cb5e2c567550907a16b7970d4e2d02cd360851bba103efd64062669596eacadc7421432198c61054837b57b223
-EBUILD contextvars-2.4.ebuild 524 BLAKE2B 3233c744a77b29b140efef6c7b0545dedac53a4d9bfc4a5ef6eb2edb4839369f657acdde2ed04fffb21544c51ed6d9caf8293762b275ff498e3721bc4f36df83 SHA512 f348f76f45e4af67032eae5ae03c5b82b742bf425c06c136673c227d83ba923fd6254deeb901430a9c152eed88c6ffd7dda21822009c0f0cbabc76dadc39e4f6
+EBUILD contextvars-2.4.ebuild 522 BLAKE2B b501b04c29d1f82198310ac6065b4d5c159e3e27e9ae028b2ccb1c8e6c29fc8edc51672cf9eb40b52503d52983fc7fad8c57b89885931bb834b05778e698ab55 SHA512 ac2272e69665782d3c7d66659d5e90b8752c16b3d3775706915b14332053f38852bba7ad7094d515202ac442b31db0282990c242ceff2275b54b98812410a532
 MISC metadata.xml 354 BLAKE2B f7fae56b019c0b03a1e699cd23711fa067c36549b7164f7d4f4aa1001f49d290d1dde42a5fa8c57cd77f20454181f259723ee6847ac38e97c7fd46235901b201 SHA512 79f19d5d674af1a45bfc90fe9bb2e4fe9e21d1fc195e6475b9a7c28014dba29a45fc49787b5fc9c2d7b33dc8ff6ddbc7a4710e296064d4fd097bbbc0df6a0ab1
diff --git a/dev-python/contextvars/contextvars-2.4.ebuild b/dev-python/contextvars/contextvars-2.4.ebuild
index 4b3537ab3fc9..d0d2c47baf94 100644
--- a/dev-python/contextvars/contextvars-2.4.ebuild
+++ b/dev-python/contextvars/contextvars-2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="dev-python/immutables[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index ec805723e6c3..ac33f5721bab 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 652 BLAKE2B 5ba5f86dd58ccf1b308ca9d8eddd97f28cbec76956aef19fc022435982764416e8a78540384158384da4ef7a39827d43ca1783aaa25756a11d9929f829541639 SHA512 e75a0347c5231cd0940af4c9640e772dcdf1e8d4e7c7beb809a111f17eddd1a659b1156df7993d1481e8f771acd857ec6252eeafc3a801c3ddc34afc893eb263
+EBUILD cookies-2.2.1-r1.ebuild 600 BLAKE2B 68695f37abb08ea52137b5870eda1afc3059bf15dd403069c0e7b5b409537716510af9f0395f7df39381d4e2fbac2c40b6629d272ce61e620bcbd43d5c49182f SHA512 dd1d624fa0f70c014eb908ec9fae2356e2857092d96890955bd6efd65f5672b2c59a7b6ded48df1c9f28e2b9cebe12ddf425b520552f3498ff6acbca440586db
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 71d88d213492..e8c760bf849c 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=(python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,8 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
 	"${FILESDIR}/cookies-2.2.1-fix-warnings.patch"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 5132e3b33c96..c2464a9abbfe 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -4,7 +4,7 @@ DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648c
 DIST coverage-5.0.3.tar.gz 679171 BLAKE2B b87b256ecdae0b63ae08ed1aea9ff1f4177ec5da63c18615d66f207c3b7c71da4730432bfbdb66a8b55fa2056016226b09befdfc5d0fae57ccc56f08b2690b38 SHA512 51c648b4529cc84534865ee804bcd3dd35a6dcb23f20feb3c4702025b924de3a010fd8d08238eea926ae1874c5510ff006bc120e10d01db795ea0af6fb82834c
 DIST coverage-5.1.tar.gz 687427 BLAKE2B f4eee548cd6fb58c4a527b9e0ac5ee4133c984358f42ca0c87301f95eb60253a2748ccf9d4e88358941d7897998e68e3c5e70e6dc7387bf5e60eda950f4a679c SHA512 7bd3ca158fe2eab1946c52161fb877623d4ed0382de193aa6eb267443fdda86089ec7aaae518115d6a3b5487fd1400320eb503b9afe83182fb3c3621ccbfb6d7
 EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e34bf2b12ce2f78f0882e690ed2d8fb9dccc805a3ba05ffbb25e5a69e9590fbf5706800b0b5fdcb055e0044afa92feb6b7903b23f85343d8b5d56ad724a4145a SHA512 24f1e3624cbf90d7debff9fe521cda8c4ee9cc368377cfa7d1143768ea7f674f534a3c94201e5f3154b0fc5499e953b53b79958bd5aa0e40d0e424ce6f28f02c
-EBUILD coverage-4.5.4.ebuild 1751 BLAKE2B 352c85a2d73b7038051580f07e2abb6874c4677c221a4bf02986b4af7e7b628b58bfe2fdef6ac4a6a4bca361942d7620e9cd3127bd7280fb2ce75591bbeb463a SHA512 e55db96e70c45bba7ba91c75a6857a6c1e81f725ecffec7f60649641c9648b5c3eeca8ddd1a6353249911b7d7e8fa2ada0a3e0fa3139b3a365c174d149d65200
-EBUILD coverage-5.0.3.ebuild 1646 BLAKE2B ecd044c83b02a4ee483312266265e63c821a861684bd520d4a9cbf9d9d1d92b8e81f91221b0f11c91e9c7a0c5c952973793c6b9a929443af4007271c96ef0ebf SHA512 d674c6104d6747409a33612f90b93960fc13fd7316cf14e76a75c948812977f428496e467d22280a9f79445649670ddb996475f1739ad1a89fd7cb07cddff354
-EBUILD coverage-5.1.ebuild 1791 BLAKE2B afac14009fd9c296df13bd77323f3ec6448826a36024b026e24c792b37b71af6b4711f33cc9ed31c7bb2f72b03463137944cb325d39009b0a74d3614ff946c6e SHA512 fdb92f3672e74b8c5a283a9a512abd896eb66c902406c924ac3a9953e36e45abcf0c0c4db5e96ff52f5b896fddbf60a2a4a7362ca720de37d31912bd20a6dba9
+EBUILD coverage-4.5.4.ebuild 1781 BLAKE2B 55b451353694347d7b4e9e87ca5587d50e70d347f2816e0dd0b24c6c00a6fd7ec91571444b2df83b6353afd3146e6092b57cc0fc4b0c8d0112347fffcbe6d0d4 SHA512 777994ae048628535ba3abceb487e5ac19f1d08e61f0c513e5e0d11a3395bd1134e5d8905b25fa0857552bc3808e45e8c4089a1875aa815e401e9f945592d8ab
+EBUILD coverage-5.0.3.ebuild 1733 BLAKE2B f1d829127c544d1406e1d8932f1b3bd777a6bdc1c72afa9153b0ea19979d86ef15f6b1c60772981044408bf136d48898ed5d2a7eec7429e1131d9b1b5f5dd378 SHA512 f5ac7129c42f00f214fccf0f9c6366ba4fdfccf8d6dc886c9610735a811fba1e535224747959255a07524c72ba7e2d43ca5479fa9cbac065a9e213ef5f72f4db
+EBUILD coverage-5.1.ebuild 1881 BLAKE2B 66d6ecf693948487a006ad9353a94d8094665694aecf32316eee9b734797c117a5dc39410c045f55de48af8b405dcbbfd8899c945a624d764086c1e614cfb4ef SHA512 6067101e9d4697b22fd790dfcfe940fbd1e134c8c154d398ac6855e02346eeb4c4b2d1a047b3d32f5389523dd8605f4d845b156948aa19b13e981a57a65cf9e1
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 20b1ea189252..b0bb45b31246 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,6 +24,7 @@ BDEPEND="
 		dev-python/PyContracts[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/coverage/coverage-5.0.3.ebuild b/dev-python/coverage/coverage-5.0.3.ebuild
index 87f93f4544be..9e5bf5dc484c 100644
--- a/dev-python/coverage/coverage-5.0.3.ebuild
+++ b/dev-python/coverage/coverage-5.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
+PYTHON_REQ_USE="threads(+),sqlite(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -14,15 +14,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/PyContracts[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/coverage/coverage-5.1.ebuild b/dev-python/coverage/coverage-5.1.ebuild
index 7e9dfd78916a..3a8dd9ab4096 100644
--- a/dev-python/coverage/coverage-5.1.ebuild
+++ b/dev-python/coverage/coverage-5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
+PYTHON_REQ_USE="threads(+),sqlite(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -23,9 +23,11 @@ RESTRICT="test"
 
 #BDEPEND="
 #	test? (
+#		dev-python/coverage[${PYTHON_USEDEP}]
 #		dev-python/PyContracts[${PYTHON_USEDEP}]
 #		dev-python/flaky[${PYTHON_USEDEP}]
 #		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
 #		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
 #	)
 #"
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 258a09775c75..410e405f7fbb 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
-EBUILD cppy-1.1.0.ebuild 437 BLAKE2B e7fdd2dd00fb907ca8c9fcb0af15cad2b2e9bb0fbff4c24b2bf4555a6b8773447833932bf70e1052f60181f4930ba63159ca373d5f3bfd90744f51ba885a8fb5 SHA512 6024054d07dd9345d6ce064968e826a7b12c3802939594ea6b9ebd32c713d430311302887d77490e1ad8782dfa067a4d300eb0a6192a65437e657a4de535bfb7
-MISC metadata.xml 724 BLAKE2B f0d1175b26d8ca5c4bcd9676125eedbd33b266bd3592ad92a6917c526b4ab3e8bb12713f69699ff672a488573b2d78e49d14ddd82760b131b18ff431a91d543e SHA512 a002b0b11b089c398b7cc46d900a3e33a2573c33a27a4df6ac18cf9ce974c3ffa7c07d549f6cf95c8c3c9e56091620e94436a57c1b671ee11d8bd15f36f36671
+EBUILD cppy-1.1.0.ebuild 453 BLAKE2B 6d49d20a5facb4e5ac171fdb71677ee56486cd22c7a547dd1348befca040e6c5224d4e8488b33a72963a9a30f9636537fca779808ec43b746e4b837a54219562 SHA512 a37529f034a66d15cbb2199c32497959c401f3c1cce72e6479efdbf699d2628ce0a6557649506fb755af50bd8958e3051c8c96898c017b0f26c6f8e9b6dbffb3
+MISC metadata.xml 825 BLAKE2B a57826e675f337f60df2024e4f1e719425112c70a192e3ff45e091f2c75cba7587572ebf23e84b52cc78783d67ccb6ae96a2214407485b886cba09e29ad99f92 SHA512 2c92243896cfeadd31868b9a99d4a36d7d1c88931bde44385c62f8450e116b64a19f7f7d613b81584741281697228571a3073f18267ab49341f4a6c2493e6c83
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index 46ce9c2c095f..e441a5e5ed02 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cppy/metadata.xml b/dev-python/cppy/metadata.xml
index 16cf244d93ed..b3b734f45ba5 100644
--- a/dev-python/cppy/metadata.xml
+++ b/dev-python/cppy/metadata.xml
@@ -9,6 +9,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		A small C++ header library which makes it easier to write Python extension modules. The primary feature is a PyObject smart pointer which automatically handles reference counting and provides convenience methods for performing common object operations.
 	</longdescription>
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
index 3831df534be0..02815d75acd9 100644
--- a/dev-python/csv23/Manifest
+++ b/dev-python/csv23/Manifest
@@ -1,3 +1,3 @@
 DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
-EBUILD csv23-0.3.2.ebuild 802 BLAKE2B b8e93946e1c98028cbeddbab617b37bf03460db42fbbd740ea11e82e65a43fa39f918541f7d47cb60e935e775d6d9476602c7b798aeed680a7c39b273a8d6891 SHA512 f43a88ab341064ca08c71399b4ee6d4b46c7875cd20ad307ad151ee256e1a10131f78af46eaf95ca20e8c75591ce10568216b3387f4ec1fc8094c9e79335aa5f
+EBUILD csv23-0.3.2.ebuild 832 BLAKE2B a16a8570af0dfd392aa6d6aa2bcc98bbd2dc40b1f4eedd9c8317974335ff946dca2cea11d0f1a2aceb1f9527ea36c0835664ba7b79600d743e897f1050e2effb SHA512 e80bddd33800f9b4362bbae4dd9c2fbcd554bd4fb5559a877809278514d499afbac65a9d303530ab234a5bd8252d4cee7bade249dfe3b92b63afc74a97646396
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/csv23/csv23-0.3.2.ebuild b/dev-python/csv23/csv23-0.3.2.ebuild
index 5eca9f30e606..dd774623cfe2 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # note: upstream really uses mock at runtime
 RDEPEND="
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index b1e142a6b4a0..041cf04bcc59 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,4 +1,4 @@
 AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317b23e03e160405e0d4209a95579e70c7bbf1d4d5926af6d24e2016dd51aabfeacc796f9e32649b65c269cee SHA512 6f13aab4de020c39bbbe531e9fbbb24b419d7dfd8a982d04748ee067254a52087ffb04189e05428abfe6e8f163a25541bd5f0681c660bb550ccc84865d03f6c0
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
-EBUILD curtsies-0.3.0-r2.ebuild 795 BLAKE2B 6b6e96cf602de67ba9f50572fb3547053756523d4cadb35506dd5fee55ea21e57e2319b4eeeaab0df143b135f44af58ebe6500233390de185dcceee6ea6ae946 SHA512 186167046443bf4c3088ad24398c6e20f37975a527305af9f8196de7a130bc869c71b87e48c2cf3f3db886355abd23af509ceb0f2912695b617a6cf509b02987
+EBUILD curtsies-0.3.0-r2.ebuild 685 BLAKE2B f07f481b5bb42e2fd63ea3be553a39289f57f75d325d5f96ab58904a2106f2d51f865bfcbbdb9be7cf6a810d3fcc70abff80369cb33f053eb31f1852941d6942 SHA512 b9a44eca87130792ce8388552e62275cd1cd6d1b4096a4ac79ab71795d8e7b2f2ec43831c14a654680a892a0077632f7c02aa0bc55a661ffaf37451667d57a98
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
index 72e5411576e2..77763052bb44 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,23 +14,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
 	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyte[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
+distutils_enable_tests nose
 
-python_test() {
-	nosetests --verbose tests || die
-}
+PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 61098374954e..f7ecb6111898 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,4 +1,5 @@
+DIST cycler-0.10.0.gh.tar.gz 21672 BLAKE2B 68b48e8359210845e35e4fe2cd1f48b48ac2c1ce67196fd9fa1e3a83a3bf15d6889a727bf62a65097d0975e93e660550084ef66a0c3a3de98ba04d439d29965b SHA512 685231d455dfdde70eb71415dfe561e07c34579d7b31ef7197f4c1441301635b387fec903d610b35406b619264f4c0cc616562de8f02b8192414c29274b63c01
 DIST cycler-0.10.0.tar.gz 16553 BLAKE2B b2f3263e18fab74eed8c92a888f1a5cd47a2c24499fad3d9b9737b2fd01c3b085d6008d65e7cc075d9336321193e779e9c1c7b4daf9bb33be219f54267cd40dc SHA512 b7d2ba19861ffaf4dea0444bfe68b5a6264a022d7b3f02c9ff5e5859e3901de12a90f8dc7469e995e09c418515b3df55dbf05a0cfe5368d40790a2c878a74819
-EBUILD cycler-0.10.0-r1.ebuild 814 BLAKE2B 2915a26c86e3ce1e94985461e58823fe1ec3f3a206579aa51f2797ca527a5e52885379023995ee6133f56b11c975c04431c398bb6e556a1dfeb9ba8e2c807b67 SHA512 313aa86bf537b1d5fe98bdc0bda2ebda12b4145c466b46b8f3af0eda7c22b09bb7898263d4c539789332dc95fbac45f9fe516e7ba197f7e12e713fec9fb87cdb
+EBUILD cycler-0.10.0-r1.ebuild 627 BLAKE2B a3b11bdaa985c35db1362fd647cbe6aca19ac702bcedf835844594652f87935efef4d0431fd3b00ada329cde452ec08fca83a6133a1556e24b8f30791a7b75f4 SHA512 d06a69b3aabe19fbaa30f74b8f1314aff5d578ce6ef042c01e81072302f18d4d18321fb922c65c35ba0c88a25147e206adff34b4e39829fee0b423d7383545ae
 EBUILD cycler-0.10.0.ebuild 822 BLAKE2B 6a3df16f2754f978f4e53323798d673ab65cd43501a4751bd20f02604580b2ce1c733eb73d7f1ba14669b67b97fdb0901c463d0a2e709f30281295a1f53837b9 SHA512 09d5178d0e0934870d53941b9aa97d7a12e3248f178c794ae95afc58e86886bb670d46249a0dab93025a3bb01059fd062380c0e0c9de099a97e68dcc74ce3860
 MISC metadata.xml 366 BLAKE2B 67803b534c2f9bc0266a5178178da1e400cfb9721c63d8d7103b6ee12b7b76808a570d1748d12ef55685df108d7dfdb7ff632e63152c4cc0e65ccfa442ae8efd SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
index e58d24b2b91b..1672d652ce2a 100644
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,23 +14,14 @@ HOMEPAGE="
 	https://matplotlib.org/cycler/
 	https://pypi.org/project/Cycler/
 	https://github.com/matplotlib/cycler"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/matplotlib/cycler/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-# Not shipped
-# https://github.com/matplotlib/cycler/issues/21
-RESTRICT=test
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
+
+distutils_enable_tests nose
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 2e62e33e1c9f..f0bdadb0f50c 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -4,8 +4,10 @@ DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe
 DIST cython-0.29.17.gh.tar.gz 2080768 BLAKE2B f53f8593f4ab9ef87c8fff47a031d365a748b617b7ee41872768a6a649ca3c6a6f9a338f115881117cbb4ffe1811047ac5fdcac745d6387eee29487c9da4c297 SHA512 f722e4feb0fcd0de7b882d0ba7cd78c37b6aaa4438619607665ea269b207a482fab6ca65cf12bab54d94b5929776c973a270c0748ed35b0f88a72811bf90d4df
 DIST cython-0.29.18.gh.tar.gz 2083532 BLAKE2B 7e10a32f15542ed0d7d381223f6f20ec75d7ec39979ca58192cc0f95407cece31fb053776072b49e447ffb0ab5ad1918c6b53ad8cb277df08fabe0eab8ccf958 SHA512 5a1430345fbe42235a58fd44dd4e4ce17c68485349295af6c4e9a01a06117e18ee7700c34fb5974759f012acd5cf8400ed014ef16397539272c38881e905234a
 DIST cython-0.29.19.gh.tar.gz 2083634 BLAKE2B 47ed2c8b8c4d56889f4414b974edac878a454c2cefff77bb3ac5cb51f926c19e3466949e0c9f470d896589e881afa32d8873c71d54b3999d221ae94f2b2d4588 SHA512 402f95f82099db0ae99ca2f849a9aef97558c9c6be62d3b3c66c346ecc94efbbe824ffc77f3cc6dd1d7054a2fb0332b10fe855ca1b054095f2df2ee297fd96a7
+DIST cython-0.29.20.gh.tar.gz 2087315 BLAKE2B c429dd2aec6c6dec0a3430ad8aefd17b62b65d9e2e7be0d48e0ebb808897533ac724ba69bdd639e3cdab2da2399f7dccea524dd71a48594e44c7a737026a5b5a SHA512 5bd0506abf8e0a823316e697db021e1e12296fecef2165ea4b84fa595554ebcdcf2688cb675c77e0e1567ab44ed502757b5eb4ea55b84505ae350f70e4d90ecc
 EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
 EBUILD cython-0.29.17.ebuild 1961 BLAKE2B 987cee2e8dc49dece5384df71337d7faa5344369b3fdbc6e2f60eb802639e26d4db8793fd5507c2f91741a87dec1cee289e2228fcfa1adadbf52757150728c90 SHA512 a957c2ae398285102fa23fd783415fd03b83d9c404f8fbe2f0f042612629908c982e9a92af6a660acb630120c0e42a50710a987a7b630b54ef59c86c6fb50de0
 EBUILD cython-0.29.18.ebuild 1961 BLAKE2B 987cee2e8dc49dece5384df71337d7faa5344369b3fdbc6e2f60eb802639e26d4db8793fd5507c2f91741a87dec1cee289e2228fcfa1adadbf52757150728c90 SHA512 a957c2ae398285102fa23fd783415fd03b83d9c404f8fbe2f0f042612629908c982e9a92af6a660acb630120c0e42a50710a987a7b630b54ef59c86c6fb50de0
 EBUILD cython-0.29.19.ebuild 2118 BLAKE2B 00188704dcd1fc77e02b68ad6fd1ffad35bb6240c48a07ad12f37e66fdc6b954d9b3bf6d472d1b55c2a86313422f392d38bb13925754dad2232574233e545c41 SHA512 6fb8043b8c245225e42f04f8062068ebc33f3f3eb5a67c95b014ff55e8fcd357c8d6ed0155d1b76a6a65c4e3968d59adf5d85a76106ea2bb8c1dd71a374f46c4
+EBUILD cython-0.29.20.ebuild 2118 BLAKE2B 00188704dcd1fc77e02b68ad6fd1ffad35bb6240c48a07ad12f37e66fdc6b954d9b3bf6d472d1b55c2a86313422f392d38bb13925754dad2232574233e545c41 SHA512 6fb8043b8c245225e42f04f8062068ebc33f3f3eb5a67c95b014ff55e8fcd357c8d6ed0155d1b76a6a65c4e3968d59adf5d85a76106ea2bb8c1dd71a374f46c4
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.20.ebuild b/dev-python/cython/cython-0.29.20.ebuild
new file mode 100644
index 000000000000..8b4b6e7acc61
--- /dev/null
+++ b/dev-python/cython/cython-0.29.20.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			python3_{6,7,8})
+	)"
+
+PATCHES=(
+	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	if [[ ${EPYTHON} == python3.9 ]]; then
+		# https://github.com/cython/cython/issues/3349
+		einfo "Skipping py3.9 due to known failures"
+		return
+	fi
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dap/Manifest b/dev-python/dap/Manifest
deleted file mode 100644
index a80260b1e9d1..000000000000
--- a/dev-python/dap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dap-2.2.6.7.tar.gz 54055 BLAKE2B 390893117a0fb2c67a1b809f71fdb470653033d145d6ca9aec0845e0ffe263582f5cde164aadaa5d188987c9dc792e499e3627a1a003372056d56c99dc9953aa SHA512 8b9ee3fbbe15777f050f067be29a8d4e8e8b58aa8b430f69330da262593808838c8e0b3946a6f7932dc5d4d1b9dad12be73b98f82a6c399f7383f2630ad6ce47
-EBUILD dap-2.2.6.7-r1.ebuild 916 BLAKE2B 0c2f186856134928d36e423f2ff7da84d6fab337e43f260d2dbb42abfd5348b4c80e098a1d4fe2b05700e656dfdbc3ce5e61d254e3b2f0a8a1f0d236dfb45b2f SHA512 2e13e68356eabab54ddf5b0d9bf9b6e3a44129ff54bbaad2fff571a129b20cb456c1270fddf82dc8e6c8eaa3fb854f1836cf0d003cabbe07e7085bc329c99e07
-MISC metadata.xml 787 BLAKE2B 68a204a85b0df24ebbbbf87ee70c1eaddbff4fdedb4deb09dd055dc803d922b10b83a4fe9630601b2310c6c423ed8fc62d7978a9290f525c105a98d8c1b13114 SHA512 5a3c57d7c7fdfaec93ce83540af0ef579edef170224913af1cb345c88958f58d5af4f8b273eb2bac024290531ac92b7bcaaee17c7bf5f8005c48d1e1a75bd0cd
diff --git a/dev-python/dap/dap-2.2.6.7-r1.ebuild b/dev-python/dap/dap-2.2.6.7-r1.ebuild
deleted file mode 100644
index 3a4577fa507a..000000000000
--- a/dev-python/dap/dap-2.2.6.7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Data Access Protocol client and server"
-HOMEPAGE="http://pydap.org https://pypi.org/project/dap/ https://pypi.org/project/Pydap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="server"
-
-RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]
-	server? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/pastescript[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/bugs docs/Changelog docs/history README TODO )
-
-src_prepare() {
-	sed -e "s/'dap.plugins'/'dap', 'dap.plugins'/" -i setup.py || die "sed failed"
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/dap/metadata.xml b/dev-python/dap/metadata.xml
deleted file mode 100644
index 25a2f22e3d21..000000000000
--- a/dev-python/dap/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-geosciences@gentoo.org</email>
-		<name>Gentoo Geosciences Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<use>
-		<flag name="server">Enable OpenDAP server support</flag>
-	</use>
-	<longdescription lang="en">pydap is a Python implementation of the Data Access Protocol
-		a.k.a. DODS or OPeNDAP. Using pydap as a client you can access
-		hundreds of scientific datasets. You can also use it to serve your
-		data from a variety of formats.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">dap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index aed41f23f6b4..fd0c7680b52f 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,3 +1,4 @@
+AUX dbus-python-1.2.16-py39.patch 948 BLAKE2B df88f38be549b81b404f3e5e7f0d4c09f7c43bc9ee91b0534059fbb3edbbe675e7ecd467d5d57f365aa59d510f06c41c9ae4970a5e5e8d2fad109bf55cfb507d SHA512 ce5f419736dea09de8a58e372c7587afbd270d806bdcc0eb3b7bd5fa830be00453152ea7ea44a32a06d860ca3174282f62ef44d5f8c9d43de7d8724c69f2ab37
 DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
-EBUILD dbus-python-1.2.16.ebuild 1701 BLAKE2B 76afc20e2b0e5a76c4e43e1bc4e875744eb74011752827ef038a69670444f74a296d1f04a09d726d22a916576b9f3b8e6291a263983982f14be1022b5a420a03 SHA512 b9861ea5c126bda423a19f623045b0a4cc1b66ab27d48c45e39f03145dd54b7b1af994a62b0d2f486da698ebb3392b2d534ec585584af7a60dc8aa4a88399538
+EBUILD dbus-python-1.2.16.ebuild 1746 BLAKE2B 46f2f65358f3760e8df721ab4aca351745829ba690d9544294543a3f8494671ea1865d7f77583d6755d90e04473128ce796e25fab26399335d02971dd60894a7 SHA512 96a9e48911f2fe44d14ca889789d9c8ea3d2d02fba3c6b3115f3844611343878dce69ca878aa3dbe368fb04e5a2e98d0ea4aad2d1594eed231278f2760247e59
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.16.ebuild b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
index d7512b4dc8f8..e07d2500f718 100644
--- a/dev-python/dbus-python/dbus-python-1.2.16.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit autotools python-r1
@@ -33,6 +33,8 @@ BDEPEND="
 		dev-python/tappy[${PYTHON_USEDEP}] )
 "
 
+PATCHES=( "${FILESDIR}/${P}-py39.patch" )
+
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
diff --git a/dev-python/dbus-python/files/dbus-python-1.2.16-py39.patch b/dev-python/dbus-python/files/dbus-python-1.2.16-py39.patch
new file mode 100644
index 000000000000..93db26cfcefc
--- /dev/null
+++ b/dev-python/dbus-python/files/dbus-python-1.2.16-py39.patch
@@ -0,0 +1,33 @@
+From 6a899a9174c8008ba5fb576238ea4d7c970453c3 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Tue, 14 Jan 2020 15:29:43 +0000
+Subject: [PATCH] service: Adjust to deprecation of collections.Sequence
+
+Since Python 3.3 the recommended location is collections.abc.Sequence,
+and the collections.Sequence alias will be removed in 3.9.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+---
+ dbus/service.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dbus/service.py b/dbus/service.py
+index fd57054..0c8695a 100644
+--- a/dbus/service.py
++++ b/dbus/service.py
+@@ -32,7 +32,11 @@ import sys
+ import logging
+ import threading
+ import traceback
+-from collections import Sequence
++try:
++    from collections.abc import Sequence
++except ImportError:
++    # Python 2 (and 3.x < 3.3, but we don't support those)
++    from collections import Sequence
+ 
+ import _dbus_bindings
+ from dbus import (
+-- 
+2.26.2
+
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 6b88744f3993..5a01087ad047 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,6 +1,4 @@
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
-DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
 DIST dbusmock-0.18.3.tar.gz 72049 BLAKE2B b5ed8ebcae51fedec75fc810e07dc9a38223bcde541cbfddd5d3fbf1ad45d1458e6ad39c1fc69ee77165d751f978cb4483929e823eacbc99a7ae414aebf4d0f0 SHA512 6f7b42eae578ce03024b3b5cc85e82f04a467803f4c8b4cb5193454dcd849038f11e6ce5028ca9dd57ea5a9380c1b754d8fc644b4a24b51deee9e87b409115c3
-EBUILD dbusmock-0.18.2.ebuild 1064 BLAKE2B 282628d0121ef32532f38bc4e98e42bc1636025f5aa8d776a3d9c448ce951285996708a39b05ff6c6ebd2cfe9e1d8aec49eb0981151da22970868e6f5714ef3d SHA512 b3ed90e0af1c5baaf6cf2df15674d9db6766fe8a0e834bbf98fc0f2817dcc5a34e7233272c75a091436683ddb0ebb8e7a1b86239c94d403803c5c60f69d2a53e
-EBUILD dbusmock-0.18.3.ebuild 1073 BLAKE2B ade2492c052712ee1d57241aca24e39eb0496fc1b9741cf8068066d5a71a32fab2b98a8417557e47713af273b600bec692e9bf5b8563adb87e9ab98232df4f97 SHA512 0f2dcd212f3377f9e704d78467517de8de14b69cd5338fbfd1b8302a36fdd739ffbf7245dc758609a0f453e4bc91c6ecca2bd33dc00a9a7a2d2c1e864479dab4
+EBUILD dbusmock-0.18.3.ebuild 1072 BLAKE2B 7eb7f14837a54cd7c2811a968f9677fd49762f4a28f7e93f2f49191d2e534d96d4627ae48c71ab579f2315df075745a505a0e72b4f1776cc94cadb63f4405d50 SHA512 8563923983c8e32bd40e7b514989e8254e43d0b763ca1ee43d456b78b504690d5c4e1ddc033f5e4d66a8b3d8b281acb6881d2757f35da0147c7ea50a21f2d3df
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
deleted file mode 100644
index 0e30599771c2..000000000000
--- a/dev-python/dbusmock/dbusmock-0.18.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/0.18.2-disable-polkitd-tests.patch
-)
-
-python_test() {
-	nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dbusmock/dbusmock-0.18.3.ebuild b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
index 3c04dbb3156a..6150da8c974a 100644
--- a/dev-python/dbusmock/dbusmock-0.18.3.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index e313f1458c8b..b46c3b9de1cd 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.2.2.tar.gz 15170 BLAKE2B 4fb4a4493b96b7d45e060146212d6f2b4b31ecfa8ad5650da34cedb53725b20cbecafc765f3208cffbb3bb3c4f92579e94f369c9b8216e9693eb0fcddff96af9 SHA512 9b45c4b422cab9e6858235b413b622f077bf4e5254214165c50afdea767dda7d9f39e7be7b0d583b87849a078271f4fba34ac5fe0f35bd196eb7f396bd308fe7
-EBUILD ddt-1.2.2.ebuild 606 BLAKE2B 55edff4460c89a93ad4acb1bfe6d3d2801272d446f4affa5d082a4bc7ab342f5a7beba9d4246c41b8a2dfc1e1a6f8d9e288439d46ac26fd12752073dac238f3a SHA512 2308c3c34681ebb008edc2fa761e24049ef27f70ededbd0bd99ba9e4149375523b2a746b11883df0758e3911cc7ab413729fe6dfd2f1d335b181ce4fadca909b
+EBUILD ddt-1.2.2.ebuild 605 BLAKE2B e6e1f190d955793f0b6d0bab760dae269624bbe0c171fe49fc68056d07f3743b745bc5fc85007a756aa193ac65f2af8ee18df19daf3653c5df8607fcbc30e109 SHA512 8487112288af7a50c9d77ff3b8f42d42efc005ca32345845f4f7b85a13ba47c691f0a52ca2d5e96b6f1020abb40aa0186020a2202f06cc06fa6c87c9993cae11
 MISC metadata.xml 626 BLAKE2B 38700523353a601a81f8051783177167efb8f07f07348b6123070bf6933fc4463f2ff86a9a96cb5fa638bb92f695a5c932f6567eac7ff3db4e6f7488f0e135fd SHA512 e846017dd044c76958586bbbf7578d49f93a2b2231827a8d779e18649c3b1a6307cef13f12f01241d7fcbfc2bdb880f1dc9d7adee1b41dd9697a5e1644af0800
diff --git a/dev-python/ddt/ddt-1.2.2.ebuild b/dev-python/ddt/ddt-1.2.2.ebuild
index 87a971000d73..70b7e9257aa1 100644
--- a/dev-python/ddt/ddt-1.2.2.ebuild
+++ b/dev-python/ddt/ddt-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 64f528485499..e74c7cc646a2 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,4 +1,4 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
-EBUILD defcon-0.6.0-r1.ebuild 581 BLAKE2B 5b4c6681bae1285915352272550e1ab3b5a0757c3b38be163a645873ca8a7fbb99791ecc00be788e93eac1093f2343bca52a6c0c2006f313194d0c36edf3d0b7 SHA512 bc7e249c159022737385f40d21c046e34e8cce89fb5d6845921712952abed55453f946206178f4b7d06566ec5b13fe564e76e43d46c9b079911c835df53ff187
+EBUILD defcon-0.6.0-r1.ebuild 599 BLAKE2B e7f814c5e7b728b953ae57157983b10664135b8e1e4dfce5bf7d07cb23e5596b46840b9ca1812faed5e12476e8d05effdbcbbcde9ac4f4ebc09ec4549af9593d SHA512 091fcb94416dafe70628751baae3f549ab7ece630de822267515c7109d00a23318efb64656d9cbc41acf28c636cb54fc5b5f9285452bd932483a947a87604d74
 EBUILD defcon-0.6.0.ebuild 550 BLAKE2B 8f51dddccd4986ed9c0b63cc6a5e9e5a59aa1900788710ec261eb0db1eb56c457fa64e24e8765c18bc7fac66629d48ac7d219af0d7f27b560d17f6b7e1c6ac83 SHA512 898848cd36ffcc28c34d1ebaa72e4c9383140a2a9265f6dad87a72dd5cfe38b3c682df29ca90c9644da8020e279a8df84c53928ed26873b59812f1f99f434fde
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/defcon/defcon-0.6.0-r1.ebuild b/dev-python/defcon/defcon-0.6.0-r1.ebuild
index 5fc00d82572b..dd848b952b92 100644
--- a/dev-python/defcon/defcon-0.6.0-r1.ebuild
+++ b/dev-python/defcon/defcon-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index cf49809f7bb4..85c0e9c6bcf8 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,3 +1,5 @@
 DIST defusedxml-0.6.0.tar.gz 62670 BLAKE2B 352202cd8157bcd18ecb06921eb086cfc91e567dbbb18592e526caa4fed69bc76842eda849813b829ef4389d3df74303529e7f775d56be2f919783fc7fb19b04 SHA512 dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226
+DIST defusedxml-0.7.0.rc1.tar.gz 33950 BLAKE2B d2794d0d06ca7bd1faa0b33f3fa7e02fcfb8b7bb7bfba5e0cf4119f7341a618daf80b08e0a6949cad67c5d3ceb84a5d984d731ae129b9aed383b5b583b114013 SHA512 068a6610fcb791385dc1956d1ff1e8b17b143a0138e6a10a293b8f18153d733e160e924f52c565e2df503101faa9b2c3d4718b2980f0e5652034e250b8a82f55
 EBUILD defusedxml-0.6.0.ebuild 706 BLAKE2B 89b25d405f98d8cb4c9cf56be3ac607f0eb0141fe9ae7f2aa094ada4142430869e2632ab90008ad5e4651cd2a2c2745c1922fb6a4e9561227b8186de79fa59ff SHA512 80409fedf6cfe66a1422fb8595f0e51a9325db0f6279b940b7d582f9b132511bf5fa31d85257cc28b16e7cb2cc7dc5012771e213e05303dd974bdbc9f1046ea6
+EBUILD defusedxml-0.7.0_rc1.ebuild 777 BLAKE2B 23a52ec840c99171ea492b215716d654318ade7ec9ff3b7ac969462cfa931097f428bf01dda1055ce1867a2bef3b568d3a80a39ad60f555e2d2e8c12616566c3 SHA512 b4a4887383cf981b364f2982836c795e601940397a2dbaec7553486115a7ae96b014bab43a63c49436986664dc14f443c8589a6215dcee43ea2748da67c08956
 MISC metadata.xml 409 BLAKE2B 9a961d587d44b320c8d15a987cc6f06542f5208c013587ebbdc5f7dbf1df5cc67691ac7f9b21c7cf465dffa0e1c25e2b822a71d6f7fd00d62964f3068b21a78f SHA512 2de7bb348b7e8005bf13eb5e077c9d9ab4b5ee4cb19c7ff858cc73372ad40d0e45e7bc978da4658c379e784bddab0f9123daf3161b85c098c163a81ef128070f
diff --git a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
new file mode 100644
index 000000000000..3249d1629c0e
--- /dev/null
+++ b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
+HOMEPAGE="https://pypi.org/project/defusedxml/"
+SRC_URI="
+	https://github.com/tiran/defusedxml/archive/v${PV/_/.}.tar.gz
+		-> ${P/_/.}.tar.gz"
+S=${WORKDIR}/${P/_/.}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	default
+
+	mv other examples || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples/
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 3457a1c3223b..d24934691767 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.8.1.tar.gz 77499 BLAKE2B 0cc8e07c14282f55103ff510db4db14da1d13d86ef2529c719b8fdfb3abb6289a842926871a84e0edc9e905ea6e2c4fa372e42ea230b8c6a6d05d4ca83577f6c SHA512 4247a7797c2a3f47a2b91ae257899cdf3e5f4aa4498ee95e3929c10131dccedb8122e66506ef84d1fe00f769620227202424b1d003ea54103d47f386f18f2304
 DIST denonavr-0.9.2.tar.gz 92898 BLAKE2B 5e7248ac3fb3e55dd8040f70c59b082a76a25af36a378c7cca73e0f6f85de7ff2465f95e74b5523d3e5d5a02bb7833335c53739255e50b85891d3c9b92e0f13c SHA512 0748ea61635c6b76ec6987b5a4439dee1ef92b6265a29473f377867e451c055cd5a0cfbd93230d2fd0a75800ca5aab861316a78ac07acedcbe88aef281c4de30
-EBUILD denonavr-0.8.1.ebuild 599 BLAKE2B dc1142d9854116bc6aaeae4c62012abc3a271a56520696d7f0ac353ef2fbf1ec2b6a853c018080f95e7ece25f2623993ad4a9429cf28eb0cf27ba459b8f6444d SHA512 38fa0577ee3076a8d99a3af61e8343268e627ee27987fc4e1aa70ae23537f878d0243c2ce9f021c611e75107eef91b4ab64554865c09606a8ff1210141b6d13d
+DIST denonavr-0.9.3.tar.gz 92910 BLAKE2B c9b93db7908b2d0375c417f3980d1df2f5b5191fee5fa1ab32ca3031c9fe190b5c0fb3afabdd42c14aa6baf6b6e451171a339e58e0716882fb19d91648802963 SHA512 80ccedeceb1df0c0d71cd6ce2f601b9a966bfac0178321528e84edd7f422489039a7867df3493f14012be383fe95aa0b4f39d6fbb7a0c292b6b2e6efc1fe8b93
 EBUILD denonavr-0.9.2.ebuild 642 BLAKE2B e66bcc19190ca45f4397255f88237939727d205468047a46b2aff5c2d345933e00dcb034e2b1b15f146819bb6e06803b83e8208ff3b8ad55960b434c50012cca SHA512 dae173a5d85608a9d4a3acd0a372c50a01f6274589aba76c7c996447a45c7cf75c7fec2cdec0ade499d251a8834ea9988d8c4d202dd3c839d1478df4b3273d01
+EBUILD denonavr-0.9.3.ebuild 642 BLAKE2B e66bcc19190ca45f4397255f88237939727d205468047a46b2aff5c2d345933e00dcb034e2b1b15f146819bb6e06803b83e8208ff3b8ad55960b434c50012cca SHA512 dae173a5d85608a9d4a3acd0a372c50a01f6274589aba76c7c996447a45c7cf75c7fec2cdec0ade499d251a8834ea9988d8c4d202dd3c839d1478df4b3273d01
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.8.1.ebuild b/dev-python/denonavr/denonavr-0.9.3.ebuild
index bf2e9a92067a..d2099e429b0e 100644
--- a/dev-python/denonavr/denonavr-0.8.1.ebuild
+++ b/dev-python/denonavr/denonavr-0.9.3.ebuild
@@ -16,7 +16,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/requests-mock[${PYTHON_USEDEP}]
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 2822a4159bee..3e91224b717a 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,3 +1,3 @@
 DIST dill-0.3.1.1.tar.gz 151986 BLAKE2B 71b364730805974117cb00965a2276aa240b6265f2a98ae8e70ca2f9d8bf7a4b801fac083f2395932fdc016de3f068fb46091f296910ce96725bc982e774a40a SHA512 e61610451972522316d7ed6bc8287e38521fcd2e6736b43200ae498f24596994caec92313be1da71cf1b536fbbe01505673fc8018bfcbaf7705147a294565ab9
-EBUILD dill-0.3.1.1.ebuild 570 BLAKE2B 940939b066fb2fe3564284ef0c53f1706d129f634f438f6cfb2e45ad4908cdd89ccc026658f17481ca3a2b3578f934cf1f6aa508426dee89096dd216d37b281e SHA512 186dc5b569a0a82be47bbbaaeb06317693bdae4e41cde88e47ae7ea1ba83011c72eb7d2c713c45a7c1f012c5df2be6cb4f738a2cfdb3656a11c416b955f90f41
+EBUILD dill-0.3.1.1.ebuild 572 BLAKE2B e6567ad2af1b6b54898b81d0f0cd3bd8e82f6ac176d768252a02a9d7eb9c0069e1df24f91657aef873bb279f51e89c5853eebf428414ea9690b8b5eed9479f66 SHA512 310c104e8b0ebd763d9651f7e43879cdc7ee56bc33bea0ffae024512fb108e9ff08e26ea27e2413c12ba2331f26ed5ce10ed8baab6d4cb2f36665822a99bdbd7
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.3.1.1.ebuild b/dev-python/dill/dill-0.3.1.1.ebuild
index d05c926f14cc..c1896db8f750 100644
--- a/dev-python/dill/dill-0.3.1.1.ebuild
+++ b/dev-python/dill/dill-0.3.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 579fb158f142..8ced9bbba543 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,3 +1,3 @@
 DIST distlib-0.3.0.tar.bz2 848089 BLAKE2B 70f88b570229e2ab4c95bd8da0375aba189f66dec8defcf8eedf1be6924d93bd20b54c68e5fba867a6c68a31d4ef926ee2dc18ccb0391278680f30a62d0cd251 SHA512 01b0e7d59736414a241efdf883e4ee63eafe9614ce3b4147781a5750d25d6383543146c5277e3e0d3e11ce03693afd0331c6e3416776a6f84de7a4d9dadf3de4
-EBUILD distlib-0.3.0.ebuild 1406 BLAKE2B 6abf39938492ac8b29e85c6db83a04ecd8a8a557fa2a72bac80d0d29a43e0de20ff4036fbbaed09f61c752ea9538d4d9421d7f45613a621aab512eef7ed02406 SHA512 38464a082232bf72b4d2e0ece3666048ab1c10d9b792e856b74badf0b59d0c441fb5913267569ad1a338b8812e05619e24f677dd0a288d7ddbf13fe45936db49
+EBUILD distlib-0.3.0.ebuild 1574 BLAKE2B a4cc5c704c5c568d8ea95c5a9bc152474e1114843b796e7b75c57b313178895d5a6617b879608088481420a1030f52fd25142f4c057157809b3ac327ef0f471d SHA512 594ef111c28ded89a86a2c79a28a38ecc0f78ae96141c992ad0e61cc233d3197bac7e4dfea2d3c3c1665ff307f54d34179a28b481a1646c1fe2378d23d7765bb
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/distlib/distlib-0.3.0.ebuild b/dev-python/distlib/distlib-0.3.0.ebuild
index c0fc78b79397..10062678328e 100644
--- a/dev-python/distlib/distlib-0.3.0.ebuild
+++ b/dev-python/distlib/distlib-0.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests setup.py
 
@@ -28,6 +28,9 @@ src_prepare() {
 	# no clue but it looks horribly fragile
 	sed -e 's:test_sequencer_basic:_&:' \
 		-i tests/test_util.py || die
+	# progress bar test cases, very fragile
+	sed -e '/ProgressTestCase/s:unittest.TestCase:object:' \
+		-i tests/test_util.py || die
 	# TODO: investigate
 	sed -e 's:test_upload:_&:' \
 		-i tests/test_index.py || die
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 289e617b3595..af7758961490 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,5 +1,7 @@
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
 DIST distro-1.3.0.tar.gz 48067 BLAKE2B b8dc48dc82e96c674c5fedf2f55167fcbabacde59954ce978085f0a05e5184bf8c323c76208f2ebe0a2cfb6ac41ce0351774ba6ba02dd13b22a7506ce3e5cf58 SHA512 5a3e363b7dbfb5f70967937d04b566e5c8aea10b6f3b9be7485e6f49130766ec5480ce1c1c14ec759e38b2488ffa697478246e53be72ad277cf3bebac7dde741
+DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
 EBUILD distro-1.0.4-r1.ebuild 580 BLAKE2B 20955997a8892260da7ae6bc2f293524de87d1afdbe1523fbe3c37253cdd8ac62dd6a1cc1835c428df8a6d3efd515641a3682bb258c3978413579dec82ef2b99 SHA512 72dd237a708854d166a549604dffc17286d79292ab6f5efb45246a6602860650a12ff0069327b0d8bc805ca35866edbd8a1da8ce1246fa3c638ecfb7837855a6
-EBUILD distro-1.3.0.ebuild 534 BLAKE2B 4c41d013fa3d07b8a8a4133db308d854f8adad97107323631663e0da80d7b31ea531e27f8416cf5beddc3818c01ba66e268b06a4ccfb08df4ddcb9c1fc48d172 SHA512 08f01cc7b9f110de79072b7fac9239706c070c2dafa0e14190e128a38fb7114432b1a50f0d6dd3945f4b0bdfe7ae66b407dd15616e8ab6b365ccb561f7ff9c9a
+EBUILD distro-1.3.0.ebuild 535 BLAKE2B 59c2d7b16e2a061871db85f5679ed1ffef42cade07e4028e4f4bacce59052adaaa3b2d296d9d45151ae131653d90660b1b5b1d144b9b7653ccf27e9c693aa063 SHA512 0f89047367718413042562512da81da83015e8a0969a4f025fe28ea7f58ead77787ce4388ef31658ec57f6d753f3178b7b4fa142cf6e2def2b857d25e90f4fcd
+EBUILD distro-1.5.0.ebuild 538 BLAKE2B 59d42a36541025156f4401c86b909bea0ec52c7f6d7bcc035903df7fea572d079aa4122171ae386f832d653063b923860f7b7da2368ff05b3b7798027e3611c2 SHA512 ae3c8b725531a702ee15bad2a9a646ecad5d8920d42436b2e856a6d3bba07bd724e5f7197b4020a08e44f35b4d012b3864d4029c8a7452b0f4e582bfc3566715
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.3.0.ebuild b/dev-python/distro/distro-1.3.0.ebuild
index 24530d370bc7..1a47e20e1ac4 100644
--- a/dev-python/distro/distro-1.3.0.ebuild
+++ b/dev-python/distro/distro-1.3.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
new file mode 100644
index 000000000000..24643b164d39
--- /dev/null
+++ b/dev-python/distro/distro-1.5.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
+HOMEPAGE="https://distro.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 1bd2593eed47..9d54b02b6c5f 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,8 +2,12 @@ AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fb
 AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
 DIST Django-2.2.11.tar.gz 9010479 BLAKE2B 9df126f62368c43a64fcdbf9d3831c78dd37e41eb88670517eeec84043083cc437d95301d86798b5945313b515d63bd12cba8484e74b6da2311af2e86ce87adc SHA512 b33ece4606e5a23626caee121018522166a0e1f32bd41ea4eb3d4c1f624943990a07e04c5a4f5d52958e733790178474e9314d346ce1e4d5d6e49ac2a700c857
 DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1216ae983a8da93cde20eac65729eaea1de8d3a7a598df8f9f228c3d20a5da9cb53a149d1064c58824626fd8aaf SHA512 3c01b606e34dd0abe5a03bc55bf7d9328a0da370c22bac4d15c3468512b26ad57fd07d942a2a34129ce18bcc5e86c67e163d0f4d5b7ea47e3e899ba7617ab28c
+DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
 DIST Django-3.0.6.tar.gz 9070990 BLAKE2B 9f918f64baecc5fe18ec08293da0f81a5e6ba9dc034b7e43f11ac9e67fa8d16c155878342babad9fca8ed30caf5ec3335756e2e0312c463b46a23b4db92fd4a0 SHA512 4c92c51386919c389037d6c6d1de3cb6ec443bd1f216f20797fb20fb24ea8d021701a03805ba693deadfa82b1aee38ae0d7fc03cae94cd744b1d1fa47ddc46ad
+DIST Django-3.0.7.tar.gz 8947502 BLAKE2B c26752f41f04f23ea1db9863d0919c17ed27b75133e22cc342e453e40077f05f6458f8edd290bfdcf828a181e38d89a1b4faeaa9cb44176ff0f7d67910d6b9df SHA512 566a78c3686baaea2ea8f2db2c1762a78ec5e5ae44f0be43f49c83899c2a0a9d1b2297a05ce8f4bc6bc580c494dde66bb2be47a8269cce3e1b007fedd857e5d3
 EBUILD django-2.2.11.ebuild 2304 BLAKE2B 9c7961c57036af4e8e3878275033b0afb905b0a1e32ca07a8980b1745259a3c05cb239c642cf1d44a1074160dccf578f109db375c5a397fd203ee0aa73bf054c SHA512 1ec3cdeaf83d7d05c6f68e5216993fdd43be0dda13db401f248a4d81a0c93d5ff6dbf074d113c6be32bc830495e18bfb0022c9be3b6a1f5c333c2c6304c8fb95
 EBUILD django-2.2.12.ebuild 2319 BLAKE2B bbb771c0f705b919c27691bac19ec789cae02e247d5e6ad38d008fbdaeab3cbb04880838967b70ff75b28e3cd40c6f4a3fc8d89e6833f70883846d9393277761 SHA512 bf4087b350b4b5341102e9f3adcc0af00c1f21464d3d744a7c0fbd51b13c88c3720f61fde56a8f55819f981c623ba0a0fa70eb5a910105b6b7f864d88762b199
-EBUILD django-3.0.6.ebuild 2343 BLAKE2B 47583820f8eeb3c878bf3b620aa598b6487e5d2006f1c6ca379a69afb1da75e2981ce22f4bbcd7d2f0aab491ddcd154b0d590b010d500a1aca46bb24c2d232c3 SHA512 84b59e0a190d9f186b6d3201977256c743b5588b411599a6bede9518500c00c543a1a0696b580ed18c7fefa2041231bbd02ff8cc4356d261317e48cdf7c6dacc
+EBUILD django-2.2.13.ebuild 2319 BLAKE2B bbb771c0f705b919c27691bac19ec789cae02e247d5e6ad38d008fbdaeab3cbb04880838967b70ff75b28e3cd40c6f4a3fc8d89e6833f70883846d9393277761 SHA512 bf4087b350b4b5341102e9f3adcc0af00c1f21464d3d744a7c0fbd51b13c88c3720f61fde56a8f55819f981c623ba0a0fa70eb5a910105b6b7f864d88762b199
+EBUILD django-3.0.6.ebuild 2348 BLAKE2B b4bf267890cc8ac02c653fb21ab7db9f63b8d3631a050244af1f561df91de9723f80319a7e72026330f2f3badf5b49e857c2ffd17f53408a2774a0d37d3f90f4 SHA512 79414bb07684ba02db7197e6f177b4986b4cabe647abdea46bca87d0a10ba4f6804547f36b1206c2515cb6e4211d60484fa1d5116a946cc84a92f111e54d8add
+EBUILD django-3.0.7.ebuild 2348 BLAKE2B b4bf267890cc8ac02c653fb21ab7db9f63b8d3631a050244af1f561df91de9723f80319a7e72026330f2f3badf5b49e857c2ffd17f53408a2774a0d37d3f90f4 SHA512 79414bb07684ba02db7197e6f177b4986b4cabe647abdea46bca87d0a10ba4f6804547f36b1206c2515cb6e4211d60484fa1d5116a946cc84a92f111e54d8add
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
new file mode 100644
index 000000000000..2166d02e126f
--- /dev/null
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+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 ~x86-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/sqlparse[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		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/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+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() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	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.0.6.ebuild b/dev-python/django/django-3.0.6.ebuild
index 02ac84c2297e..68d6de70d162 100644
--- a/dev-python/django/django-3.0.6.ebuild
+++ b/dev-python/django/django-3.0.6.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.0.7.ebuild b/dev-python/django/django-3.0.7.ebuild
new file mode 100644
index 000000000000..68d6de70d162
--- /dev/null
+++ b/dev-python/django/django-3.0.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+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"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		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}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+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() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	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/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 014dcc053a7e..0edd4515b6ba 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,3 +1,5 @@
 DIST dkimpy-0.9.2.tar.gz 50263 BLAKE2B e18b1337699c1e843b4878cc84aa9988adaca475cd22b406b558c132a36761669c835dbb9718ba6c40fa5f78efe669d08c8517d6208f783399834737f4805671 SHA512 a1e7ac778f8cf0897793f296061ef67a6945b136db1a7aee18498ce33111d1a0d485b0ce32f52c22c0866be644065e000de57131301000a83a1b55b6a875bfce
+DIST dkimpy-1.0.4.tar.gz 59689 BLAKE2B ddbe24f3d98833260763eac65199dc282d4833f22adaf5495247c2198626da826d8e1b40767a7a85dd2fe62efe527d99e3c2bcbb838f1038e6ae65af1a60b686 SHA512 0c6b35f6658b11bee340cfe51eca03c301ee052ce602a326b4519bbe134cc7f7d816b8b58faf38bec53b71201bd57dcd1869dd4f3df942cbf2f49caca04cde34
 EBUILD dkimpy-0.9.2.ebuild 489 BLAKE2B 49ccf54702fb4209edde655b4d9f24970faaa97bd55fb9739953c421bf17ebf01da7d7cb2b310ea8fe9935e909ddf0ca50003f92d8bb12f7d526b471155b7c0f SHA512 937d48be3116d4abb7fe2b957fadf07b03f66d1b3a1a1c9ee607475ce045e5ca6ce123a2aeb5d9a8305c8169ee3c16ae7283f274b24e18c579bc3d9e4b9e39f2
-MISC metadata.xml 1162 BLAKE2B 002d890c839d0fb8fc6b03368bccc69bf4e4136ad70fdb82e5f8e156cfe22bd774feece7fe522b78c400c332e4bcf95a7c52b81271879ec891329e1ed342d342 SHA512 3a496a88b0a666afc846f69be9a7819d513087cefd3541524c0d8aaef1d073071fd49a69b364938c649134878bc150d40840c03628e93f14f8bb001508395be5
+EBUILD dkimpy-1.0.4.ebuild 811 BLAKE2B 402c9e9dd19249c1e684ce3499a6c43b5733f8d14643831d4a1a1d4c481ae4b5d47ab9eb51c0ccad0cad0b728dd0af0813affbeeaa0984b1f278041ef7656829 SHA512 ac8741c77ed3c4a0978c8de959873cbfc53b5b44fc2474b5054e42dcdf04972cb9a4f3b0050c7e32abcea6392f1cb120b673d159a4741c2322664044cb32b585
+MISC metadata.xml 484 BLAKE2B 14c8de62e359754a4d1dda796cd4f41a216cc3a740bbea0e127bd08f9db82acfa616159beffbd7763f345e61b32152dc66417b1dd125a500d32ddaf71655ea5b SHA512 5290aa58fb15040115413a5eaa144a5c39071a9362f86b34c969b057821267ef978b90900d4d5e52b336c00927cda6878b679cb2d4c2a7f9b4f9dfa9ad425ed6
diff --git a/dev-python/dkimpy/dkimpy-1.0.4.ebuild b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
new file mode 100644
index 000000000000..459673c351c6
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="https://launchpad.net/dkimpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+BDEPEND+="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/dkimpy/metadata.xml b/dev-python/dkimpy/metadata.xml
index 83c7605ab5ba..2249c703089a 100644
--- a/dev-python/dkimpy/metadata.xml
+++ b/dev-python/dkimpy/metadata.xml
@@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Python module that implements DKIM (DomainKeys Identified Mail) email
-		signing and verification. It also provides helper scripts for command
-		line signing and verification. As of version 0.6.0, it also supports
-		the experimental Authenticated Received Chain (ARC) protocol.
-
-		Originally developed by Greg Hewgill http://hewgill.com/pydkim/ - The
-		code in this project has been modified and development work continued.
-		This is now a fork of pydkim and we've renamed it dkimpy to avoid
-		confusion. The original author of pydkim has confirmed he no longer
-		intends to maintain it and supports this as its continuation.
-
-		Current documentation is available online at
-		https://gathman.org/pydkim/
-
-		ARC is still in development. dkimpy 0.6.0 supports draft
-		https://tools.ietf.org/html/draft-ietf-dmarc-arc-protocol-01 with the
-		exception of requiring 1024 bit minimum key size (this matches the
-		planned changes in the next update).
-	</longdescription>
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">dkimpy</remote-id>
+		<remote-id type="pypi">dkimpy</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 3ae590c8ce56..3f9258dc29ed 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,4 +1,6 @@
 AUX docker-py-4.2.0-fix_splitnport.patch 1662 BLAKE2B 3e29288b0cbe5c410ba8b9d338237d0b4cf54fd26524eb241b84806ae62ddf10d6d2f90872d949d4321d9b543575e5ac46df4faae54c561cf53724eeb5913e94 SHA512 ab9c780d7ed79370325e684c0358e196de72916605f343680398a9058ba115afb52ec6a69ad51da1b32389d2b90a7911b62097ca9523e946d671e82c8a799a91
 DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
-EBUILD docker-py-4.2.0-r1.ebuild 1229 BLAKE2B aafe3ffa374b1a2e16e8ebfe5a31fdb07a08ed1dda1a4a5384cef0cd85dc372295230f17e5da5903ee5f514bae5a002cb73c54356c796eaa6358d706085c3a04 SHA512 cc70dda792a2949ccb342dd849964036556d76824b3e98ccaea209dede9c165656225a49cb58e3f547f73d1cb7b7fc8f15fdf50ed89835a9ac1a6e644628b34b
+DIST docker-py-4.2.1.tar.gz 234562 BLAKE2B 4b554199f3675340602be27395e0194e827ad81dab48500bca0d4858c699e79ac5108f46eae09c3ac6ae1b580498fd5c78f026ecfd8549b938bb5c6e6cccbd94 SHA512 46ab02d4c247d41efa0ca75d3e13f8aef2d3fe4e6d8624c5a98a728f16c58d0dd8de742be710dc2b2f616dc2cc14a7a8796899e94a4b71a00554baeab105330f
+EBUILD docker-py-4.2.0-r1.ebuild 1228 BLAKE2B 074d94d5cb6378ca1d202286eca77dd0732a3e30cd41d667ecadd78468127ea9d78e77d1e32d09ad1825e54c3f3c3d023d09289315e20e576434600bee71dcdc SHA512 aeeee6eea4871077688298dbbd76a9fc92ada64fcb6f39eaea7de8d3b3e58526d0cc39cf5fe8c301ce31e40518f7feda618f2c70949c60b7c90dca14af4143a4
+EBUILD docker-py-4.2.1.ebuild 1111 BLAKE2B 524ab20e9b5e7e915a8735bce04b3b2bd89b8d60bcec67cbc808b2f4bb72bcc95a2546850fa70e0d2d1fd15bac1dd933f69488f0f52c9790cdf1ce84ac0a90ee SHA512 dbb866c7604480bde41981675fe1da3f3896b01d6d5928af923d84d7155245c785da4da45dd2607bc10c7389cf95ca0dd2f0079d44c4ce067feeeb8291a99f80
 MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
diff --git a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
index bbd3efde1731..b730b40c98f2 100644
--- a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
+++ b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-4.2.1.ebuild b/dev-python/docker-py/docker-py-4.2.1.ebuild
new file mode 100644
index 000000000000..ec7b5cd81787
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/recommonmark' \
+	'>=dev-python/sphinx-1.4.6'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# localhost has a better chance of being in /etc/hosts
+	sed -e 's:socket[.]gethostname():"localhost":' \
+		-i tests/unit/api_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 9a78860cbbd1..033a1fc221f2 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,4 +1,3 @@
-AUX docutils-0.15.2-tests.patch 1547 BLAKE2B 361285ad1ffd4d32a7e04b5e9e56a9dd91c69475a5c7b9fffd64b6735d789b4793ec35d0fa733d016ffd4eb5c97a8a8baba64bbb79b8f5cece71e9f4d3d947bc SHA512 83856452008c041295659c95e45d477672a1faedfae642d3980c3ac416864a77f21bdaebc88b67f43f7da87a92b3bd6baf04e37f44c66a46e2bbc941c0d75131
 AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 EBUILD docutils-0.16.ebuild 1871 BLAKE2B bd400bcb45b3c0c403c36af98b18a5b9e2ca199b7753f00419c286399e7f641375aa86873aa92b36fe2d72f93c6a54fe2aa3c222f12fa443f21dd862549eec8c SHA512 56b6647e9c484334a1bca6b41ea80f13d31a37295e7cf24b3b9389e2df198651b39f1fa2655f0f84ef0bf9b1c96bca4b960af2e6cded0bc469c05187ad505ae8
diff --git a/dev-python/docutils/files/docutils-0.15.2-tests.patch b/dev-python/docutils/files/docutils-0.15.2-tests.patch
deleted file mode 100644
index 11ccbd01b90e..000000000000
--- a/dev-python/docutils/files/docutils-0.15.2-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru docutils-0.15.2.orig/test/test_writers/test_odt.py docutils-0.15.2/test/test_writers/test_odt.py
---- docutils-0.15.2.orig/test/test_writers/test_odt.py	2019-11-25 19:38:23.327374852 -0800
-+++ docutils-0.15.2/test/test_writers/test_odt.py	2019-11-25 19:38:13.585433399 -0800
-@@ -38,6 +38,7 @@
-
- from __init__ import DocutilsTestSupport
-
-+import unittest
- import docutils
- import docutils.core
- from docutils._compat import BytesIO
-@@ -146,12 +147,13 @@
-     #     xxxx is replaced with a name for the new test.
-     # See instructions above in module doc-string.
-     #
--
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_basic(self):
-         self.process_test('odt_basic.txt', 'odt_basic.odt',
-             save_output_name='odt_basic.odt'
-             )
-
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_nested_class(self):
-         self.process_test('odt_nested_class.txt',
-                           'odt_nested_class.odt',
-@@ -166,11 +168,13 @@
-                           save_output_name='odt_no_class.odt'
-         )
-
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_tables1(self):
-         self.process_test('odt_tables1.txt', 'odt_tables1.odt',
-             save_output_name='odt_tables1.odt'
-             )
-
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_custom_headfoot(self):
-         settings_overrides = {
-             'custom_header': 'Page %p% of %P%',
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 2c03018885e6..f337cf240fc1 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,6 +1,6 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
 DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
-EBUILD dulwich-0.19.15.ebuild 1693 BLAKE2B d25bbcc97cbf6ffa5857fdc303fc8d2d6a6d239b330a1ac54839e7d9ec0db35ebc17860c37b1477b7398b13fad90b049cc4ea9ed3a9eb2176ddbff96e4b9906d SHA512 bdfb491569f28659f96d19f9f02b9c86909717b21619acd795c5c05121e2afa4a8d31a9c97d0ebd1c8956001773d9622e5c301d9d77a16d576474c052932ae21
+EBUILD dulwich-0.19.15.ebuild 1700 BLAKE2B 006e9e58a776a8fc8ee8f191dbb4337972d298a6cb282b89c6ef6bc0e8e7cd29243c39869e56d6e2aaa2d5f419b26f0f4aaeb8949704b3524487babc01ae8e3a SHA512 fbc2a8d54f636bd049333f7bb15dd94606b08d011a9b1f450593b1f136cf7e6faecb17586d86fa916ad26446fafed6d622b3d5214246cbb602b6096edf0ff8bf
 EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.19.15.ebuild b/dev-python/dulwich/dulwich-0.19.15.ebuild
index 006b7239ebfc..4b0785701595 100644
--- a/dev-python/dulwich/dulwich-0.19.15.ebuild
+++ b/dev-python/dulwich/dulwich-0.19.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 7e92227c16e6..50482daad22a 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,10 +1,13 @@
 DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864deae4e0545a2cd1924c4e2f4c0bb61134fe9649037f23c10123efe0425d376183035171a952a10f1804196a97287c59b508e97dff5e9e05063a67ede020 SHA512 301e552b221369cca8365ee64d8b52b5e8abea0e26159f7a6e77a1722fb1107641fe2472138869f5156bbbf43c74e62ffb22d0c35062190505f7504e3f571e16
 DIST elasticsearch-oss-7.5.2-no-jdk-linux-x86_64.tar.gz 68711865 BLAKE2B 01a456d3965c83fe2a94e87b0f19dfbc89666f01fade36cff1b7733b24c91580bc95b9e0acf0d9134078715be890bfacdc6c0091cf56dfb9dc43e71bf387806c SHA512 ea494dfb743e5ea12dbbc269d8103fa08644c580291eb88b25000743d272aa87c8709ac9fb2939ad387d5d335f0795c943114b8471074bba7d583494bbc6d100
 DIST elasticsearch-oss-7.6.1-no-jdk-linux-x86_64.tar.gz 72567711 BLAKE2B 8fe3901cb3ce6577918f6b711f63e0ed8f10013a01ae8c197cda8e5592b2e7c99f0bb7179decc19e26ed160c21d7cfd66eedc3d6fc265e89244ce1c9a5ef27c5 SHA512 da396be8bceec32b5f4c4f9091edee51710f39f5aa1135c7c392719d9fdd0c99e92b681cf628135013a37fd881dd15540d6c660a50bb18b47991f0d723aadb64
+DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b
 DIST elasticsearch-py-7.5.1.tar.gz 116602 BLAKE2B b9ae9cc7496e911d102118a6e2684e8942dfc0f4e92d3cd9cf6429c7c7a48521ed5b61174ddc4fbcf8001c30e74fe11649e5ef13e90ca32307290ae0bb8d0f6c SHA512 9a82715031fbe60e5d795ca31cd7ba3fa653b3100e8d1b53e0088c55ad3ed7f4c4309a07327d41d1ca1abe2fdbb9f4b6e97d6ab39ae5dcde46b7c2b1642a92b2
 DIST elasticsearch-py-7.6.0.tar.gz 120271 BLAKE2B e99e84cf952f178c5ceaaced763cda058c36797eb1bd4b09ce7996a99417adfd8c152d980e1b5be6522a4287bb37178b9b6d93968324a57fcda5637f1caee58a SHA512 f8a54cd222af94d659087d654bcbe52da5ee90570ff04dbdd6793b870b8fd7e4b5b896620424f85057f2274ed3a16ecd97f53f704c2a97931b4876d246311ea9
+DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
 EBUILD elasticsearch-py-7.0.5.ebuild 2689 BLAKE2B cced4decbebfa315773f41d19a85842af8883d90a782e4773e0df47fa56708ccb6c263165731822c62db524481af9da2dc83096b8de2914a28c52d222e3c1692 SHA512 c17f9a7b08fc263b530a5469e8c234d76ad78eb215ceb4e43265190f3a3eda20e6f912f7afdd725c1c40903e8d017edec805f0c09ebf14f704554dfa27845062
 EBUILD elasticsearch-py-7.5.1.ebuild 2718 BLAKE2B 14306f7a0f84989c4cad1c511032e0dd40647fa6170d516ba6a15b4d66dc16a6aef17b14d5603fc1216b8df5432ac27261016b974dd38e439a611ae5f6d400e6 SHA512 2b726c8e3fb031286937001c554d4f850acf9d471bdb613f7f163df50d0ae7765387147253dfeeb400903536998ac8092ce0874bd6b62ac23186c612ba2f2e05
 EBUILD elasticsearch-py-7.6.0.ebuild 2679 BLAKE2B d51d3c7e36adf473ed69e998e2ded217d1738b66611422956f53fb476835a547866b6c3697764345059a1de2845c9d907e7517bdbb755a6db85fe01f3272ca87 SHA512 03ab5dc5806d5c19e836a489d838c8892384845ea635962dce011a9982457f026403d5688510b9156bb883fdcd80d2dae46adf065217470b1bf7465a1f530035
+EBUILD elasticsearch-py-7.7.0.ebuild 2942 BLAKE2B 272c07a8cd72dc151d1abaa94ad667c88d0a1006516782b137d41bb0ca905a9d79f642342a2cbfd06d352e919df2b42eed7d2da69e7c29f8c430b88f40f1f064 SHA512 233508866bb93f1a1876430731cc277092e7d61f8d37fc786490f6c31133a9132410fdb29606a2599b97609c8cd6aab53f60406f18b154a02a4f1185b955465e
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
new file mode 100644
index 000000000000..04145309f90a
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+ES_VERSION="7.7.0"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND="dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		virtual/jre:*
+	)"
+BDEPEND=">=dev-python/sphinx-1.3.1-r1"
+
+python_prepare_all() {
+	# needs numpy/pandas
+	sed -e '/test_serializes_numpy_bool/,+79d' \
+		-e '/import numpy/d' \
+		-e '/import pandas/d' \
+		-i test_elasticsearch/test_serializer.py || die
+
+	sed -e '/coverage/d' \
+		-e '/nosexcover/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	local es="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	local es_port="25124"
+	local es_instance="gentoo-es-py-test"
+	local es_log="${es}/logs/${es_instance}.log"
+	local pid="${es}/elasticsearch.pid"
+	export JAVA_HOME=$(java-config -g JAVA_HOME || die)
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${es_port}/g; \
+		s/#cluster.name: my-application/cluster.name: ${es_instance}/g" \
+		"${es}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${es}"/bin/elasticsearch -d -p "${pid}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${es_log} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export ELASTICSEARCH_HOST="localhost:${es_port}"
+	nosetests -v || die
+
+	pkill -F ${pid} || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 36dd1b3863bc..0c30a4e4a582 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,5 @@
 DIST elementpath-1.4.4.tar.gz 119577 BLAKE2B 65724afc715dcdb4903779933559e85c833cc262cecf2f53a86fd58e542717dc26137270bde13b5bdfcd81bb768a2dd74d7ed7213ad4292c0a1a2a4771855370 SHA512 39ce9f8e8f0a75690d5ccf5faa7e28113f971015c2baeec8b8f443b568c71154589d36dc2c5a3965eeb1d3d4257f65090cf44078747c7711bc7fc8c9ad051d43
 DIST elementpath-1.4.5.tar.gz 120091 BLAKE2B c9ac74c4b76b3a3204364532831563c5600bdc159cfe5e853852c08de0c7abbaec952304120da4f13b14d2239880c9c1612ae8db3535cf4ad1d8ea8498cc3f1a SHA512 be3908056af67f892696edd31d1c836bbd7083a96eca1217d2dc972c5fc3bc583d89b825bed3fedeebd775d5fca53dd9b9a918ff9a3238bba54efe8ac0a51e21
 EBUILD elementpath-1.4.4.ebuild 693 BLAKE2B a5c69a7d2c34beef1c29d2d5394c5db94ec27ff6d44712813ad0cbf363ff4eb1da1e2665842d6fc829704adadc64071447b8942e29aaa524f64d9f8faf979c24 SHA512 b55d339102ba114133a7f0157037391e50f3dc3efa50563d064b95b0fbd82f347baa0cd5c064f61d96b3bb18321932084f2fb6c45d6bf7b18fd41ccda043d04c
-EBUILD elementpath-1.4.5.ebuild 659 BLAKE2B 020a21825b5ddc6255a29b9bfba4cacaa58dcf7ae12fdff1e9133699d6f01a32cf539e006fe6da00c995ee2d5999b28d3893ba6f1a927b0b3e4ca264015914d4 SHA512 101c1f095ce116de694aa1530e5d8c0e2437a156cb051f4462816c0481914e479b5e2bf47889aafac836a27c8d825b2c06790b2b9436441582b8e0da7cdf6939
+EBUILD elementpath-1.4.5.ebuild 662 BLAKE2B 4886298b0fb7e2c2ce2fd3d4b83aaff47fca63e8d540b713ffa8dbdc2a92abb386b852777fa86d48ce0a4630239e39af86ad7e64d6e453f090aa1020c89dfcf7 SHA512 a319805964a6bc9ae55dd8b2ae6378a7c1eed9a398d4ab328cabd30f0cbf2faee54b38076afe1c9e7d6e68efa54efc43ba81410a3b5a12a9f7ffcb33a1e7d819
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
index 4849c766f6c0..b472ce7b0450 100644
--- a/dev-python/elementpath/elementpath-1.4.5.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 423730781863..a1b1a14ea833 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,4 +1,4 @@
 AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44894e2fa0c394585d2ad578b07e64fa4a6fce5e7c8f1c50752b1fa63e05776186759bc1ce426559405fd0a0e6c8b14aa3 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
 EBUILD entrypoints-0.3-r1.ebuild 981 BLAKE2B c17ddd8fe5238dd3998375164a4e3df4f8eff3e6ed2b187432d29cd0c4ee605a2dbbfdb5200ea4dd5d34d918146dbd91f5a5ff5190041f0e55aeab35a5e56929 SHA512 81b7e534b212e4c90de6c7b8ca543346d35ad6972405e4c3eeec34c20dae16f8b6f65ba7ef9d23700c2f655f3b21666bc9b1ef7f044cd06d6c0af883fda1c4ad
-MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
+MISC metadata.xml 730 BLAKE2B 4036e332f77d99dc24f55da8e75cc96900cba2a343a4d372c125a5eb8102a6ee789b72a87d8339ac0352e214c0c5e2c554d6899795f3ab84df3c441b9f75f542 SHA512 7febb502fc9aad6bdec9c698275aafee404cea4cea59f554a101a8186df401d227d7d8b14cc332ee96b975ea513b5cef37de80f8e39ece138cc232718e1d5e13
diff --git a/dev-python/entrypoints/metadata.xml b/dev-python/entrypoints/metadata.xml
index 7cb364b31780..0d9b750420e1 100644
--- a/dev-python/entrypoints/metadata.xml
+++ b/dev-python/entrypoints/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     Entry points are a way for Python packages to advertise objects with
     some common interface. The most common examples are console_scripts
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 327aea7dd805..2430311f8f2d 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
-EBUILD et_xmlfile-1.0.1.ebuild 689 BLAKE2B 3d25626def4e20ef6bcbd3d93ff42767be59ce4e74a69e4c0a642a76e6269ae40b3e8707b053336950f1394cc091ede4a0725304be0be2a135d91f51f43b9cfd SHA512 953bc158987f28e6338798406d334e171deb22b9252c9880ad99ba85e5748c539b5e6fcbec376b43dfdb04d71c75f5c9f35387277d423022466f702f0f7635a9
+EBUILD et_xmlfile-1.0.1.ebuild 534 BLAKE2B 358a133dc417faa90ecc929e5dcee71616648ab5236cb8019c249dad114042f5e1df4d5deedbc6342e50e34f48a50daf6d09658b0bb1aa29924b64d7fad03928 SHA512 d46942e27f1bebe56d1e21ca6ad9a2445b681a6f51e723a155ef917927556883e632323acbf0140fc25422d2b5da4c1084f876568efafece46b24d73e3afd46a
 MISC metadata.xml 387 BLAKE2B 3845ddfa1338a00f43db111a459108eeedebd0946dc93ef359f7dc01a005acf19d9985d7fd508853bb2a44de18579018450bd0f56850766bb7afa542ad8adec9 SHA512 777c9ddb70e315fa3d5a943a4037b2876361f9ae53db8d86fd84453d2ad21f10882e79b3f9148263bc2288e77382a04614a006797a35f8da810104063826d244
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index 015d1dd5cfb3..26d29a58cee3 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,15 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
 
-python_test() {
-	py.test -vv || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a2b249ef8d50..a48af42ff689 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,5 +1,5 @@
 AUX eventlet-0.25.1-sparc.patch 4901 BLAKE2B 5c2db6c09e3123c6ec655480e5f440f094071cd2bc1de3260c8443abd736d2cc52115707f0fdcffff3019ca6788287dd8249cdad5f5dad2e449ceb4067e1dfd5 SHA512 cb3f7cd7e8f0cc1c7e040bf8eb04309e98107427ba0b2a8643a18ce13f57803eaee32045e55d2e56cad45fa1dbfb33c99bb4935f153949d08f9240384d9868a2
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
 DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
-EBUILD eventlet-0.25.1-r1.ebuild 2249 BLAKE2B b3add2a56268d66b7f70e21c5536cbf166df0ddd636749e46fb7a3eceddcff6ecd3caffdb28da299af57ef5b9deeb8d99a99060128fafef898765de3b3d5ce36 SHA512 3dfe468db0d3040ca1825da95b6878c527ed01d557fc18b4ba860e131b2be41ef5de8cb586750423a29d74c6efe147e06a189a578607192a05b64b1a285f944c
+EBUILD eventlet-0.25.1-r1.ebuild 2259 BLAKE2B 05a53f452c2c0d08fdab18d43750ec6d8718896f18e837af928c6684f389f18432f7723455a44fd26ce9df872aef3a8ef173df61008e3514e7844eb5a51cfa58 SHA512 ce73b97f391118733862a2732f282acf0322f7aaaccf1c6e0183161b04615c68746a7b6e35ed44da15ade165eff9326d5f2df8b0e33c1debb8a296753c124475
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index bf65bac25846..f5ec914ba9c1 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index dad65464063c..929b8cedc4de 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,3 +1,3 @@
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-1.0.0.ebuild 743 BLAKE2B 75ea1e3ea77e11b8ec1207cc06cb1071dc0e8f4aed02294fa18888c04073d465d24bff26eba08218b3d03867d1d3d0d7e38e0cb005a0123b795fa6a0e6c28f36 SHA512 f303f722a76bacb290c2e6d107c7c619464781ccdfe673b93b867fb658fc57c312c0ad8643c993b98be6ccbf0742df05f21970abbabf84992e65e4dd84f39d58
+EBUILD extras-1.0.0.ebuild 678 BLAKE2B 08b848c3c22a47ed8ee444214fef96390518348b6e85fd9e0b982c02142dbdcf265dfe92207ee0a5bc9b0ce285805536f91737cabea5a81eb0b88c16cadf1dd2 SHA512 9b30d704f0fb6a28023af7b64c5b86e44fdf85a925d7e22fb43906e8d693829a17c003d0dddf8a0019b856460a39dd5b86e82fae49b6af22a41c84938f22d33b
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index b092e5c776e4..933ec5200ba0 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -17,11 +17,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
-RDEPEND=""
 
 python_test() {
-	"${PYTHON}" ${PN}/tests/test_extras.py || die
+	"${EPYTHON}" ${PN}/tests/test_extras.py || die
 }
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 501f0ba82463..5e6b9d941c1e 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,3 +1,3 @@
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
-EBUILD eyeD3-0.8.11.ebuild 592 BLAKE2B b35b6ea614e9c77d316b470b3c911c7ac2184ccb313425aaf33b76f31d52d8664645bce740ef52a198433742fb07b03b0286d1958cc25f097446fd139c78b904 SHA512 abcd15098c4a7d46105c1db17dd37d82c1d18e7e2bbc8ad3b5140e04341c66719aa9fc5f66c0b47f3f656a58111cacdd0be4b96181ab5bdd64680a117f19a7c4
+EBUILD eyeD3-0.8.11.ebuild 593 BLAKE2B ea9b10db1e2066ec5d4ce91bc0510799d08c387ecea1ac9b77ced3ed00a8aacdbc312710d4024a5ce8708497c6afd956d29d3a778284716ac3905568bc002d37 SHA512 2dfaf91188c6ccca84526487747c95c482c1327d8d5b24a2c92d770717c032f708b31f25b8f0f997aea4273753b553f43078e4d576602f7125d493f53ceba692
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index 6cabc966a145..214716f6647d 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
-HOMEPAGE="http://eyed3.nicfit.net/"
+HOMEPAGE="https://eyed3.nicfit.net/"
 SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 37316bd0b974..4679e818748d 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,5 +1,5 @@
 DIST falcon-1.3.0.tar.gz 507250 BLAKE2B 3ba3a989f2e9eb281f519e36a24772fe329fee849097028f3183b0e0c7908b7e06dbf0a70ba28cf7570dccbe88fa87703c47d985ea3cf761ea7d6ec3d41ac04b SHA512 a92d0b641152f653f47c9cb9b2e368d643aae14dcabe7028450d190bd08b883d37116d23d3a1ae4e092207f15926f66b12f57e38dd2edd347f6f8df48baa65ce
 DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
-EBUILD falcon-1.3.0.ebuild 1470 BLAKE2B 7544939344f194915eb811a2b6b21e0ab58a9f9af3d3dc7e9219e0b3c88d4310d0cd9c3bef2654ae5d3eb1c764c03530e1e7e1d2cb38d19ac0ffe0831e665ed7 SHA512 f0c38da0d4f6a517d48b4bae4670dd08afb95834881ede779ddf0d0e26f3d3e4ba11038b9a20b65417b133a0a265b3494561b3ec630a61089d9c792f0a36afb5
-EBUILD falcon-2.0.0.ebuild 805 BLAKE2B 71cf8fc32824d9cd77d7341a36528f7aa9fb02ab7a3f26f5e71689f59f74827453fb242f1e80e539db401337f1198cf01460bc788404f11c90238548d51e0aca SHA512 5c21f1700aca2cc1215c900b2fbc47061de968f4d5273ea2ec0545afa7215bb0a9faf92db39c1f43164692e35f5069eb81988ebf877e1f68baf3823622fba5b4
+EBUILD falcon-1.3.0.ebuild 1477 BLAKE2B d8f01dc89eb074b1621e38ef61771531c31753e22d67092817aeef279420620f86d8289651f4be23af0f1384b4d373693d9400c22dbfe4e4a8330cf6c09480dd SHA512 94ad28281449ca0488efe1a3c25dd1a4696e362a6111a53849ce05ca2fbcc670a273cb280d2f4ee5410cbba5c43471806999d750327172d2047129a155f7d268
+EBUILD falcon-2.0.0.ebuild 812 BLAKE2B 1b29c7b5261f847df57c210882c121034b49d5a840d68cdf3062ab3ddf09db930b69b594449118162f6cfa6284f2505f22ecbd9b8a34a9708a71516b493ba70f SHA512 87db99c80f9ddbb9e232f50266f8262b77219b2f54a4d24eb1c67aeecb797285cc8501b800418dc94c1e6622a2784a963cfdcd4beb5122e4db79c7951c0f2979
 MISC metadata.xml 427 BLAKE2B 419677eaecb3e5eb3fb26781cc3df41cff373a70a4899ce89cef22efbce131c457ce2bdd489b92287ff80f6d12962bd210035a5db77e518e456898498a5eea1d SHA512 7221c24f2bfa8068d4f5516e094af7dfc01786c63ae8d3f040b8d1da0ec4a83a6c507332e524fbd78e0644c978c11c89bec8c9771e0247ef48de1f50c50d8fbe
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
index 9806360ed00c..4f9fc7b9191e 100644
--- a/dev-python/falcon/falcon-1.3.0.ebuild
+++ b/dev-python/falcon/falcon-1.3.0.ebuild
@@ -21,7 +21,7 @@ IUSE="+cython test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
+	dev-python/python-mimeparse[${PYTHON_USEDEP}]
 	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
diff --git a/dev-python/falcon/falcon-2.0.0.ebuild b/dev-python/falcon/falcon-2.0.0.ebuild
index e5c26c42d597..398eac5b72bd 100644
--- a/dev-python/falcon/falcon-2.0.0.ebuild
+++ b/dev-python/falcon/falcon-2.0.0.ebuild
@@ -18,7 +18,7 @@ IUSE="+cython"
 RESTRICT="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
+	dev-python/python-mimeparse[${PYTHON_USEDEP}]
 	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 803b01f11d71..0debe06fbc60 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,4 +1,7 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
+AUX feedparser-6.0.0_beta1-py39.patch 2768 BLAKE2B 26966964d788891224adf67f0afe6ee20a233d2eb46c5215d643085edd8d8f15b7cff7d6a353029d1dc1e435dbc5cf7c690f157ae5d2069bf8684cd10b470365 SHA512 25f371a75e1b5b1688dccd1fc55be8a011018a4555727f87725238c28ca2ae2b0da491f45b9b48ef49ab4af19f373eed54ac2acf2e5a382dcebc91c1c60ae921
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
+DIST feedparser-6.0.0b1.tar.gz 250065 BLAKE2B 54e955f011af0755e0f627caa1491be15a073984d5c7c2b4edd6e9dcd6054e19b5c77cea9741d0bf7af151f9c79b22739c12db94619373f195e024df65b1cff1 SHA512 580e02bd77dcba547eb8295f958c6d30e55c62bd7fdbe25eda7687d0654b9342edf82ab637902175fc90b86a8ae9cbae8ba2c7c9a83009d25ab5c007c37cf02d
 EBUILD feedparser-5.2.1.ebuild 1204 BLAKE2B fe93ce75d144be7ae236d070bd720c49c698e0bc49703f93dc5eda311134251892f9136071ba664729a14d072d5a3ea5a325c769a70e864beff7ea35021bcdd6 SHA512 e2c077c873c93286e13e2014762617e8cb15d5d4920baf968c14ccd1d6ba8374d8c24a61da9646ea0aadc434e4eff0c54f9415cf99edbb3fb65cab45fd87d6c5
+EBUILD feedparser-6.0.0_beta1.ebuild 944 BLAKE2B 9bab175ae3c514e51827cb2196181ea149d3a61c3e49995217faab9fc5fe64f6d24c3d9b83dc3f72f1833c2b9b21cac372220c959dcef2f4bbf90f11a77f1ae5 SHA512 620a56526e001d096e3d5a4ae22fbcf42ad54b3e5047ad803ec0c5ba5f6fc1d91df0130283fa5661f069dde333178031335c4605ef7fae980b441e86f6a9cfa5
 MISC metadata.xml 442 BLAKE2B a561722b8e5ad877d3a1b0503f159b7933a2bb45673420b20f840dd876881a0fd8fc3eedb3b0c3aecb76b044c770ef42cdbcf3f210e71e400dfb002eb4742251 SHA512 20cef7a9f4d1bb89e11748a8b5ab31136b85f68d15ecec018f1f0872b721a2d53f3aa3ab06a1b97e3f79588656e327feb87f90a0e75f4adc5e879c9f0fd36017
diff --git a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
new file mode 100644
index 000000000000..1b027df23193
--- /dev/null
+++ b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
+SRC_URI="
+	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+src_prepare() {
+	# broken
+	rm \
+		tests/illformed/chardet/big5.xml \
+		tests/illformed/undeclared_namespace.xml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/feedparser/files/feedparser-6.0.0_beta1-py39.patch b/dev-python/feedparser/files/feedparser-6.0.0_beta1-py39.patch
new file mode 100644
index 000000000000..f9315e47809c
--- /dev/null
+++ b/dev-python/feedparser/files/feedparser-6.0.0_beta1-py39.patch
@@ -0,0 +1,89 @@
+From fa587d171aed1b44ee06af271d718ab6fa73b77a Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Wed, 26 Feb 2020 22:06:39 +0530
+Subject: [PATCH 1/2] Use encodebytes instead of encodestring in Python 3.9.
+
+---
+ feedparser/http.py  | 5 ++++-
+ feedparser/mixin.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/feedparser/http.py b/feedparser/http.py
+index 272faad6..53511f02 100644
+--- a/feedparser/http.py
++++ b/feedparser/http.py
+@@ -73,7 +73,10 @@ class request(object):
+ 
+ # Python 3.1 deprecated decodestring in favor of decodebytes.
+ # This can be removed after Python 2.7 support is dropped.
+-_base64decode = getattr(base64, 'decodebytes', base64.decodestring)
++try:
++    _base64decode = base64.decodebytes
++except AttributeError:
++    _base64decode = base64.decodestring
+ 
+ try:
+     basestring
+diff --git a/feedparser/mixin.py b/feedparser/mixin.py
+index 1b0dc1ae..549931f5 100644
+--- a/feedparser/mixin.py
++++ b/feedparser/mixin.py
+@@ -50,7 +50,10 @@
+ 
+ # Python 2.7 only offers "decodestring()".
+ # This name substitution can be removed when Python 2.7 support is dropped.
+-_base64decode = getattr(base64, 'decodebytes', base64.decodestring)
++try:
++    _base64decode = base64.decodebytes
++except AttributeError:
++    _base64decode = base64.decodestring
+ 
+ 
+ bytes_ = type(b'')
+
+From 7798957b66c9cee00db9a18f84c518cacf8f14aa Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Sun, 17 May 2020 14:25:17 +0000
+Subject: [PATCH 2/2] Use base64.decodebytes only in Python 3
+
+---
+ feedparser/http.py  | 7 +------
+ feedparser/mixin.py | 7 +------
+ 2 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/feedparser/http.py b/feedparser/http.py
+index 53511f02..1119cb3b 100644
+--- a/feedparser/http.py
++++ b/feedparser/http.py
+@@ -71,12 +71,7 @@ class request(object):
+ from .datetimes import _parse_date
+ from .urls import convert_to_idn
+ 
+-# Python 3.1 deprecated decodestring in favor of decodebytes.
+-# This can be removed after Python 2.7 support is dropped.
+-try:
+-    _base64decode = base64.decodebytes
+-except AttributeError:
+-    _base64decode = base64.decodestring
++_base64decode = base64.decodebytes
+ 
+ try:
+     basestring
+diff --git a/feedparser/mixin.py b/feedparser/mixin.py
+index 549931f5..119fa4ca 100644
+--- a/feedparser/mixin.py
++++ b/feedparser/mixin.py
+@@ -48,12 +48,7 @@
+ from .urls import _urljoin, make_safe_absolute_uri, resolve_relative_uris
+ 
+ 
+-# Python 2.7 only offers "decodestring()".
+-# This name substitution can be removed when Python 2.7 support is dropped.
+-try:
+-    _base64decode = base64.decodebytes
+-except AttributeError:
+-    _base64decode = base64.decodestring
++_base64decode = base64.decodebytes
+ 
+ 
+ bytes_ = type(b'')
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 5b82023c546f..7031f618b191 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,3 +1,3 @@
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-3.0.0.ebuild 961 BLAKE2B b7a674aaa9e885980b0a025ed4255662341dd090b016183979b1b239b8278f2dd0a77cf4bdf8dd713db551a3f398464ee44e76467d2ce89d1fd1a75c84bdb473 SHA512 8742cdd70926c2ebcd1b2e6f660a85d304f7863c4bdef4d62b320e87bb895e66e8723bcb821b4b362211dfc75ab1fa7a0bb4f4d7e8cf87d60948f39378f518e7
+EBUILD fixtures-3.0.0.ebuild 1153 BLAKE2B f697e124fc8b4df9faa1b33d0fed5941b5d3ed11b1f92ba55d0132640ab7be0ae2a25430f65cca46858d94c405e3b02aae2ce24e55a3dc2a0413c358f5e8e7e1 SHA512 75139b3e324ca6efa813b97302baa275d40e90e15a7fc42e3459afc15b586bd25afaa57c3a29053d782ca656413abdf92aa27ae1f4c29e2c01e1b97ead85e12a
 MISC metadata.xml 913 BLAKE2B 716897e147898c78b273f4277b5b280ef0b210364bbe2cc2cf722394c33c65c45538c941575ebae6a5636411d38ed74bafce550d5f36a470670108b5f1aa3fee SHA512 e836e15989ce8d5a4af3678e949f6f7dea9bcb69ecd1fc0c41cd768a03842304dcd50679213e1034e460d5fb7a213c118417707b8ca620d316b99659733a39ec
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
index d659f853923e..0f6eb5d60dcc 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -25,7 +25,14 @@ RDEPEND="
 	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-#DISTUTILS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	# broken on py3.9
+	# https://github.com/testing-cabal/fixtures/issues/44
+	sed -i -e 's:test_patch_classmethod_with:_&:' \
+		fixtures/tests/_fixtures/test_monkeypatch.py || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
 	emake check
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 5a944e9cb5dd..362504eee927 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-SQLAlchemy-2.4.1.tar.gz 128863 BLAKE2B 5ce87601a5dbeb8505144c0970eecd0bf553ad3feccd74e7de567a4fe0702575c6f7935d4812410ced17b7b98e6b8e6fcb67a589681cd82464fa4cf0dc09ba74 SHA512 a55e6fe563583e240bb594c157424fba1a8462f953fa0bb14701954bcb52d1e7bf71eec38f4037c1752ceab90e798642274de58e0f950d83e234f4c702e0b6ee
-EBUILD flask-sqlalchemy-2.4.1-r1.ebuild 689 BLAKE2B 1588de4266000a79441068c8fd55fb424514e37d788e6262864a302d36bba19bc8908a97ed8930a2cab95c650e3d32b790d1d19b77f8ec7f5d96a8d5c52b26e8 SHA512 c1ea8cd09584c5044c2fbb322b5c8a0087614eb5a690164d5ac30afeafa23036957c9dd8cffdf0c5eb55201226d09759a5fd85c04a483c125c616a6df741a041
+DIST Flask-SQLAlchemy-2.4.3.tar.gz 132134 BLAKE2B fb4df0daea347021334934ec1b22b18f9c4f97b6cf07c1c74f0d1567c6f0c3e0d16909f67adef89e8236e8a53e4126f1598fb21dc6f7fa5f5e042cbe733238fb SHA512 231593d53b02c4560eeb74dca7075495eb6fb4a75a4d25257aa281401dac39ac3ab2ef0edfd76ce762332c599b9bf2d903743142056a827a3170709516e94445
+EBUILD flask-sqlalchemy-2.4.1-r1.ebuild 688 BLAKE2B 85af2a60151a0e132d9bfa9ae73a681cfd1c3fadd5c0485faa5ffd2aed4a6ae23080dbe66da6d99659015cee99a15bb397c0c0a11be1d852d86437175276ac85 SHA512 009fc89417d29260b36b789d72c5c2dd722dac8e7249f3ecdc84a7036bc20f26949c8ea71acbcf4b4fcc33d5e8ac7f0dff5d2e8a2cda8da1ee3665867594ab0b
+EBUILD flask-sqlalchemy-2.4.3.ebuild 690 BLAKE2B 3d526d3bb7238452433e4fbb221717cee4831d52b13bccf9b8c6921b9cd990bc6634f8028012d66da576b7fb2ef42d182121fafb89eefce0a720d77670acc650 SHA512 f748d247ab5067005c13d615329167af53404fe07267b8b9049c83bcb8da53bc67fe848b3e738088176ece75f4ca0495b56901a45d155f6cd54d73e27a9c91cc
 MISC metadata.xml 723 BLAKE2B da7085b4f5d703dcf5b108c0089fffba3c1c7ca5392f16aa6ccb6ea159408af392326a553b3802e851b8ef52d971276ae599552f9234702924867ecc3471049a SHA512 cb13ee8d399034ae0dea78c1ef504865ece6d8202feffdf8672576f22b92e246b386cb55398caef1e1c6504d650428fc93f5b8aefa4481674f81b789d42844a4
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
index ec14e3634167..1df802f3bd41 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.3.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.3.ebuild
new file mode 100644
index 000000000000..5733e429063d
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 2d238eb1214c..93dfa7836478 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,3 @@
-AUX flask-1.1.1-py38.patch 1134 BLAKE2B bc252d38ca5c49ac7a327b50ee62eccb26a81f041a81fb6996fba790a6ec0f11b004fe90917ef4d90238126a17bb9864f81843f41edc7e43795acfb382799482 SHA512 ce43cf60c59aa17c716802779c163231435310b1942dd02373da51658119922bd6707b910c23dea49a9727f5a6a82219893ad3918384e7ebe3b5025bb4f7a6db
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
 EBUILD flask-1.1.2.ebuild 1331 BLAKE2B c9721dad0a9e94b65f4c7b3f6b1afe645c7a0a5a8821bb5a51ba605da4ce9156186fd98c1ecfe48338510461c201fb523735e5a4383926b4bbede44e93ca9f84 SHA512 9fc78e36f192338d60fcced3d749de5030a28a8a0137d2c605c4cfb7fcd9829c1d6614dc6894f5a5544f3e5d21beddfa4002785e06665f13cfa247d863da021b
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
diff --git a/dev-python/flask/files/flask-1.1.1-py38.patch b/dev-python/flask/files/flask-1.1.1-py38.patch
deleted file mode 100644
index a03aa445137b..000000000000
--- a/dev-python/flask/files/flask-1.1.1-py38.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit c367a86cc5be70da4928b276d0218f98df6e854d
-Author: Fernanda Guimarães <fernandaguimaraes28@gmail.com>
-Date:   Mon Oct 28 21:37:25 2019 -0300
-
-    Test test_send_from_directory_bad_request no longer fails in Python 3.8.
-
-diff --git a/tests/test_helpers.py b/tests/test_helpers.py
-index 78a56221..21735af1 100644
---- a/tests/test_helpers.py
-+++ b/tests/test_helpers.py
-@@ -11,6 +11,7 @@
- import datetime
- import io
- import os
-+import sys
- import uuid
- 
- import pytest
-@@ -780,12 +781,17 @@ class TestSendfile(object):
-         assert rv.data.strip() == b"Hello Subdomain"
-         rv.close()
- 
--    def test_send_from_directory_bad_request(self, app, req_ctx):
-+    def test_send_from_directory_null_character(self, app, req_ctx):
-         app.root_path = os.path.join(
-             os.path.dirname(__file__), "test_apps", "subdomaintestmodule"
-         )
- 
--        with pytest.raises(BadRequest):
-+        if sys.version_info >= (3, 8):
-+            exception = NotFound
-+        else:
-+            exception = BadRequest
-+
-+        with pytest.raises(exception):
-             flask.send_from_directory("static", "bad\x00")
- 
- 
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index b4ec3b4ac05a..7ec4dfd192be 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.12.tar.gz 11286 BLAKE2B 9286d9d53bfca515ff01d329decc61201b8bc6231db8700d920530b21b8a213769f4c092ea4af901168ff31f57641f46853cd9d52a6a90398ec8b6ec67b7fb0b SHA512 d7059508908c6bc7f421d04c0f8dbc9884015009b3601822489119853d851f2bf3aab941a96d19b354edf3c9c377625d0faf7b92f7a63a6d597e6ceac4abcf2d
-EBUILD flatbuffers-1.12.ebuild 423 BLAKE2B 500bab2331609fd732c2de40c83a3b4d0d5e39b38b8ac2aacc5180267f884d146c3f4f03ea265019f0d08ca035aeb5702da99a56b8114620966174042e7d6f46 SHA512 78dd4a6bff070c547cd51abc6c5b25ff1fd5a0fec20c64aa3b674fe77afd7aa0b0867b880e9cf67154c86da49475039abffecd3804e7148668f3cdc4819db981
+EBUILD flatbuffers-1.12.ebuild 435 BLAKE2B 25cc7df522ade0a36fdb3e386324eb9e4d9574b010598a0bd3a710b854c4507f4c02d76dd5193a0889ae8316de76b940465fcc618597b97218200a32fc11ebc1 SHA512 66d6b69743a0e01d6826b5bc7e5ef1fdad93ff5302738c5b95cee76dd71be70b5c13f066f5a20812c8fcedd9aa6cbfc6dad6c814f0640a5419f62de7b33c3bf3
 MISC metadata.xml 341 BLAKE2B 977ad4559ebb4cc73818553b4a725b63516d5522e170726818c01800a692729394c399bff12ce4e1e9859ac577b3b47673901f76e1a8c431b59e9a2f51461a59 SHA512 bfb03828d98e2316bc1614f2491ccfcfd5f1f3a858397b40755b64c6f550391061fba3933fcf28f11f881145f90754a7d5d28396a574c8a16c2040deaf364de0
diff --git a/dev-python/flatbuffers/flatbuffers-1.12.ebuild b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
index f6e07681c316..746446bbf3b3 100644
--- a/dev-python/flatbuffers/flatbuffers-1.12.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/flower/Manifest b/dev-python/flower/Manifest
deleted file mode 100644
index 10da95333969..000000000000
--- a/dev-python/flower/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX config.py 2666 BLAKE2B 4749cb203d608b25ec1410daa40820f48c3b80bac9bc339ebf5c17ef272554a1ec64cba31b65888260e6179e6da739a91ecc5403ed6c158d43972806cb40aa21 SHA512 6f67ebdd7bc5bef3ec9cd384b1b9c8a5edccc03d20fe0bd147ce25d4ca5100ee8cd0734609f4a7bb302f6cbc3bafd92dd7058c6bdae746f483d8c7b1d7c2c7ac
-AUX flower.confd 77 BLAKE2B 6e6dcd1ccdd60ad3a89f820ebbe92a18e486cebda1c5fb51acf4be62e5b18c8d62b91d601c23a43b21bc319d77cc80fc711b803b422a19ba10120c6dc169e7f2 SHA512 291df73d16622fbff51c805a1c967d98c461dcfe54324b8f271e812e6afd3f4d3d855ce2acfb3228b096ec0afaa16ebf5e75500e5b84c4bc0d9da31c3230bbc7
-AUX flower.initd 508 BLAKE2B b398accfec2ac5690ae2905fd0dbfec173dfa8475691ca2c34469a367fdf0eeee0a0d94d6769bbcf4f1aeccc7cf64b55a1826cb61de5763024a8463eca828608 SHA512 66d066b2df7f8c6c42d410e8f0c6c1bac6340db994122040c796a0e9ff5440fc155f138a158b1477b6f50c2a627a7a18eeaf9b01d80e05d5273be3358047a960
-AUX flower.logrotated 85 BLAKE2B 145c99ef3e2345782f8616695bd4bf6f6fd9684df57bf2e95b22e67d5efc38afc7fd891079dce6c057ef82113b09f58332d96918e86897bc1dcff04a06d764d4 SHA512 ff230e516d0aeffe9bb7d43bd847abdf1d3bf0f0fe0a6aec087fa7f08e2157e7f15994997ba76fc57a03dc34a0271cb9051bba938138ad95fde46c9774f05ffd
-AUX flower.service 331 BLAKE2B f097ef9602998f77248da33e3edda6e2e31957653fe3d9416e6295b61e50b891a069c96da6fcdd53142b312d72894f0bea82f1363cae5a60e00e6c4749004849 SHA512 894d9e3cf4c87ba731ce8089efdce7e5d6f536425ce368825f750fe5367707a12b3b99221b7d9f3ebebf6881fa7bfbca6e13654ae878b046bfa94376c00039c7
-DIST flower-0.9.1.tar.gz 3880608 BLAKE2B 4451601285472fa61577d482ecda11b20244e8050f349ba1e81601ce9a3ec0126a13ad055545d4adb5c1201b6c457919bc5f4b8aa7aca700f3bfcbc3373c6c0c SHA512 519d92209dbdb7956fde30c604956d1cbbc8ec7180ff160ea088847b5b63310cd42dc949d02eef1197588b0353470a0f3ac96b44b2e3ebb093a254d8f94fb407
-EBUILD flower-0.9.1-r1.ebuild 1409 BLAKE2B e44e45e12560669669ec539d1bf647fdee4e55ef001d8f24fc14f970be48a40fcd9528e701aacdec4a5fcb8b243147b0dda170f39fed0f827ffef664e4e148f2 SHA512 18d5e099b11a3b485f31447b9cae34b522ac31e12b680ba7fcb07d98caa31e2281a0141361f6e1d5e7b8f7b04e6d3765da62b85aa6160ec26cc704ad4a6e015f
-MISC metadata.xml 294 BLAKE2B 408af2b53e8c507eb7cfa0e066f53cdb73b00f2948fd27f6461efade3f0dc43ada9a0a6846ee3d8471013edd6bc3634b28633e4458e57486c708b92ddc0e1157 SHA512 37911fe5657f83c8f1c2bbb298a36c4ee3285457f9e8f5a342379b6d87c15b1115944297370ba76b1dd936e043ba76be2790ad072b1a576077d61f91264c7dd8
diff --git a/dev-python/flower/files/config.py b/dev-python/flower/files/config.py
deleted file mode 100644
index da101ab785b5..000000000000
--- a/dev-python/flower/files/config.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# Configuration file for the Celery Flower service. Standard Celery
-# configuration settings can be overridden in the configuration file. See the
-# Celery Configuration documentation for a complete listing of all available
-# settings, and their default values.
-
-
-# URL for the broker used by Celery.
-# BROKER_URL = 'amqp://guest:guest@localhost:5672//'
-
-
-# Run the HTTP service on the given address.
-#
-# addess = localhost
-
-
-# Run the HTTP server on the given port.
-#
-# port = 5555
-
-
-# Enables Google OpenID authentication. `auth` is a regexp of emails to grant
-# access. For more info see google-openid.
-#
-# auth = None
-
-
-# Refresh dashboards automatically.
-#
-# auto_refresh = True
-
-
-# Enables HTTP Basic authentication. `basic_auth` is a comma separated list of
-# `username:password`. If configured, any client trying to access this Flower
-# instance will be prompted to provide the credentials specified in this
-# argument.
-#
-# basic_auth = None
-
-
-# Flower can use the RabbitMQ Management Plugin to get info about queues.
-# `broker_api` is a URL of a RabbitMQ HTTP API including user credentials.
-#
-# broker_api = http://username:password@rabbitmq-server-name:15672/api
-
-
-# A path to ca_certs file. The ca_certs file contains a set of concatenated
-# "certification authority" certificates, which are used to validate
-# certificates passed from the other end of the connection.
-#
-# ca_certs = None
-
-
-# A path to an x509 certificate file.
-#
-# certfile = None
-
-
-# A path to the private key for `certfile`.
-#
-# keyfile = None
-
-
-# Enable debug mode.
-#
-# debug = False
-
-
-# Periodically enable Celery events by using `enable_events` command
-#
-# enable_events = True
-
-
-# Modifies the default task formatting. `format_task` should be a function
-# that accepts a task object and returns a modified version. This is useful
-# when filtering out sensitive information.
-#
-# format_task = None
-
-
-# Sets worker inspect timeout in milliseconds.
-#
-# inspect_timeout = 10000
-
-
-# Maximum number of tasks to keep in memory.
-#
-# max_tasks = 10000
-
-
-# Show time relative to the refresh time.
-#
-# natural_time = True
-
-
-# Enable persistent mode. If the persistent mode is enabled, Flower saves the
-# current state and reloads on restart.
-#
-# persistent = False
-
-
-# A path to a database file to use if persistent mode is enabled.
-#
-# db = flower
-
-
-# Enable support of `X-Real-Ip` and `X-Scheme` headers
-#
-# xheaders = False
-
-
-# Specifies list of comma-delimited columns on the /tasks/ page. Order of slugs
-# in the option is unrelated to order of columns on the page. Available slugs
-# include: name, uuid, state, args, kwargs, result, received, started, runtime.
-#
-# tasks_columns = None
diff --git a/dev-python/flower/files/flower.confd b/dev-python/flower/files/flower.confd
deleted file mode 100644
index a74ca17f3d2b..000000000000
--- a/dev-python/flower/files/flower.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# extra arguments for the flower
-command_args="--conf=/etc/flower/config.py"
diff --git a/dev-python/flower/files/flower.initd b/dev-python/flower/files/flower.initd
deleted file mode 100644
index 1f950c6d2103..000000000000
--- a/dev-python/flower/files/flower.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Real-time monitor and web admin for Celery distributed task queue"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-command="/usr/libexec/${RC_SVCNAME}/${RC_SVCNAME}"
-command_user="${RC_SVCNAME}"
-command_background="true"
-start_stop_daemon_args="--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	need net
-}
diff --git a/dev-python/flower/files/flower.logrotated b/dev-python/flower/files/flower.logrotated
deleted file mode 100644
index 5c7f0287690e..000000000000
--- a/dev-python/flower/files/flower.logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/flower/flower.log {
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}
diff --git a/dev-python/flower/files/flower.service b/dev-python/flower/files/flower.service
deleted file mode 100644
index dd2f1d9da105..000000000000
--- a/dev-python/flower/files/flower.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Real-time monitor and web admin for Celery distributed task queue
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=flower
-PrivateDevices=Yes
-Environment=_FLOWER_OPTS="--conf=/etc/flower/config.py"
-ExecStart=/usr/libexec/flower/flower $_FLOWER_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-python/flower/flower-0.9.1-r1.ebuild b/dev-python/flower/flower-0.9.1-r1.ebuild
deleted file mode 100644
index 18ff6c254650..000000000000
--- a/dev-python/flower/flower-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 systemd user
-
-DESCRIPTION="Real-time monitor and web admin for Celery distributed task queue"
-HOMEPAGE="https://flower.readthedocs.org/ https://github.com/mher/flower/ https://pypi.org/project/flower/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-python/celery-3.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2015.7[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.2.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	eapply_user
-	sed -e 's:tornado==4.2.0:tornado>=4.2.0:' \
-		-i requirements/default.txt || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	insinto /etc/flower
-	doins "${FILESDIR}/config.py"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-scripts "${EPREFIX}/usr/libexec/flower"
-}
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/flower/metadata.xml b/dev-python/flower/metadata.xml
deleted file mode 100644
index fc90b8ff79b7..000000000000
--- a/dev-python/flower/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">mher/flower</remote-id>
-    <remote-id type="pypi">flower</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 4dc7443d4f88..c1d399282f3f 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,4 +1,4 @@
 DIST fs-2.4.9.tar.gz 126022 BLAKE2B bd7406ee0c22171af349bed6096f58bc749af30f3fae6b8532d7a2b07dd7f0a55165f4b4ab413d6ff7c8861fbe7784ae383a984d26c1cdb1bdc9100c4ae0b0df SHA512 594536eccc043547df4ec4fd1fc507d3fad2838ebb46768a11f142c68d42a776f9fa3cda8651421c6255314835a0283407ea49ebdce04af84a1646efaf5391e5
-EBUILD fs-2.4.9-r1.ebuild 1387 BLAKE2B 01462723d75efca38d1a5265b5374f38f5317b9b58f2314b7c54f656cc3baf5e438a455f9364bfd2c98ff3232f02241e6582cacc9aa3187e7220344e17aa21e0 SHA512 4964cd47da3a6f9402e48cdad771dc4cc9fc610604cfb8ac96e4c338f8a819ed1a132e2602a04ee403caf1a122c1fb3520380fb07f6c54e4a3aa1bed423df4de
+EBUILD fs-2.4.9-r1.ebuild 1378 BLAKE2B 7633a962d06dcdd51739f05510b8fbd45d5abb1a75acb3cc672be45ebcc45de86302c086fb86ad8f298ee211085d842ca11045284c75215b9cef93917531c7e6 SHA512 f548981a318b4199606204438d4b943bb372b9e05d48e4a689efd5ade1a39eaf279f5a2ccc802e5dfce08aa5685fd69f4834efc2717f88b489a8b3295322db20
 EBUILD fs-2.4.9.ebuild 1376 BLAKE2B 45b632ac7d1b5eced7f0de3f32bd14568423aa001af745fe316567c67f269383abc6869b8022cf70aeb6ec99db37520e349d69f70bbd1a74c756f8f23567e8d3 SHA512 c8123c0669b7146439444a44e1ff12f65f3b951bb4df2323873e93a22f3a8aba845a16874f154a05e3222fc31d1012733a6ffe25bb6489b552e3d197a4f01302
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.4.9-r1.ebuild b/dev-python/fs/fs-2.4.9-r1.ebuild
index 7bc6c8c04459..b3ef70757a86 100644
--- a/dev-python/fs/fs-2.4.9-r1.ebuild
+++ b/dev-python/fs/fs-2.4.9-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 01b1ce2f543e..d68d4c2fba67 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,7 +1,11 @@
 DIST gevent-1.4.0.tar.gz 5169595 BLAKE2B 0c78f67bc94d15419b8eadf8825d9657c6a7a82756308216e1ca94d5465c25836cb736b8b370a12d1003eb8614effd4110d8ed47ee2b0d7febc2bda4038adc0a SHA512 6771f4f2932055270e4f5a79ae815e93fd0f471defa7f437dc84907ea8b44672e05ae5eb6958f8d90580b2471785dce4044d9d1bbea0dd0c34c1381d88af0344
 DIST gevent-20.5.1.tar.gz 5566653 BLAKE2B 1d9a474681573ec2e9d3c0d40fbae8a91b8cfb80c3ff8b3cf0e119b0484458941224302afb59f16c3272e1d770b1c1e92a3f648754a81d2e894e35ed8a335c31 SHA512 c6f9360efa86e598b7b240cd15e24ee0711dc314bb14f8bcaee7b0768b34a0f090d66296819f4c2eb95fe1565fe1c0f3472fb47444c31cfebc348b420811aed5
 DIST gevent-20.5.2.tar.gz 5567755 BLAKE2B 9cac45f92c7c1841cca4eb52a54f71406beb3e83136170610bba326a32722de3c5ebd3b777a45b73ab5e1012eb0dc49d861b042bab0c6194e61f44e6011ede2e SHA512 24f00a599f26d673947f0ed5582f8b55d1b214677578d7c5c2f8d8c106f89a98951db523597c470bcd788de9f6b7abcd3f25f7aff27788227f6d8c7ca7c183c1
+DIST gevent-20.6.0.tar.gz 5803237 BLAKE2B 97b988964ef80fcc1c3238718b6802016fb46742c94e7e56b5196139181ff82ce60816e0a8ccc5c3e1c3b73ec11cc705884b5ac5524dbd5116dc0d8722ccc7a4 SHA512 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108
+DIST gevent-20.6.1.tar.gz 5806150 BLAKE2B fb75e440f31ad2952d1395780a66ee673c55e62b635a2c6757efe9706c404d126c38a613ac08cd088900c0b10913fe9ce9d57cec8a7cb252ae87912142cfafce SHA512 b7ceb5251b01972a11e3d51e1ebcaaca7c08d36b6ba7b138bee57f0d5da4553539a0ad538e8a433321bdac396788acbfb0ac294191e829df3f066d00816310bb
 EBUILD gevent-1.4.0.ebuild 1714 BLAKE2B 004653a06d92f0668aaca427663197f4839c0c9fd5b0bc11e55e873215d26a3699205f91e8e71189ee40a7264867ad4deeb6e3b7d985a64a9f8b5dfa7ebb0e8d SHA512 66fb5a52bf63c00b39f071b3407ca179f41ae8e3180bac96133e2bd836dbe3c7c19d5b4db6ed27aba8dba339cbbb34daee526e1db286f7d00fbc465af7cce37c
 EBUILD gevent-20.5.1.ebuild 2277 BLAKE2B 172fe82a89a3e3c1f36f66f2c4ee88f173071acb56e57542fb5da5ae24e92911dd52b6d7e0e3ce060acb47238fc4ab55edf81c365334760bc44887331594f77a SHA512 a93d813e7dc7ef05cb3b802f0bbff8853068c3cd962b399cd7013e24c2c40a6c5ac4d68797f2001334d446c6de1355616eb15032a1c3b406c2393cb8f6361873
 EBUILD gevent-20.5.2.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
+EBUILD gevent-20.6.0.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
+EBUILD gevent-20.6.1.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-20.6.0.ebuild b/dev-python/gevent/gevent-20.6.0.ebuild
new file mode 100644
index 000000000000..0ada47ba7720
--- /dev/null
+++ b/dev-python/gevent/gevent-20.6.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.23:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.14
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/futures[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		' -2)
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gevent/gevent-20.6.1.ebuild b/dev-python/gevent/gevent-20.6.1.ebuild
new file mode 100644
index 000000000000..0ada47ba7720
--- /dev/null
+++ b/dev-python/gevent/gevent-20.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.23:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.14
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/futures[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		' -2)
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index f6fc4b05d068..8c41181f9789 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,5 +1,5 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
 DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
 EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 5c08f4e43d28890245194350a1eff9113c46b37a803510f927388c4467ee9265be75938012b1e84a581cecba909ca1e28ac09f3a982592e1566e8bb5a188d003 SHA512 84a7f80f7c5565ef21992fa8e16eeba1ca9be28cf49a3b6e8dcf281656cc23a6ecd6c9bd7199a174fe3f7ab48e66697785b87a5426cc11f82826a78a0da05759
-EBUILD geventhttpclient-1.4.2.ebuild 1524 BLAKE2B 10998228195db837a01354acfcf41917c194ad5f9271dc338ca5f072f430b931a83697316e922b7724b750e9b1b7661fcd87c4395250ed2b2001ce2755391fa2 SHA512 926e496883b94c9acf993f531abb9a4b0dccf2cf71d32d3b7198142937154078dfcee282cdf5ae62162ae6a80ebe5dbb2c21d39fc8a94f7782110e9b8fb2e25a
+EBUILD geventhttpclient-1.4.2.ebuild 1531 BLAKE2B dfa676277ca7a529ae91c206f8de6438c6f9729a3e65086122adeb980f0e266d488659628e00a931f7e02b2a70b9a9141e5414a3def5a7ca426fd4af4933ad1e SHA512 c82c31c24b40299e3a4e2c395480e87fef085f6f8f317ca85ae2a5bbca8b255fc69cfddb53105fbac653383d4c75d10fc310bced6448a1dfd2fc9aa3e89e4e2a
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
index a4bdea6c6356..f1ad8d5daaad 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index c44ca7611d92..9b12628ac254 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,5 +1,5 @@
 DIST gitdb-4.0.4.tar.gz 392964 BLAKE2B ffbf9d78efc1a12e63ce639018a9c5fde366ae14a85b0ec7ba2866678dbeba2c31ff18cac9b5c4caa2b7e150d3aa5d55434352c38a5155477e053c5ab5eae707 SHA512 a0b2aef8b8b3487c22faeba5d6a60ff2b1a97e3ef075f28bc27140c973242b096463839516ec233065710b7450cb4d885904a7a253e2b518379283edd40cc489
 DIST gitdb-4.0.5.tar.gz 392815 BLAKE2B ab0c557f1233ec6f454769c3d72d982c876cf7b8f67d8b36f9ed8a6a2ee4a04a7a22e1a7453aad0d128436e679940ffea9b2c1e6d433083634b47ffff08b396c SHA512 a3f562928a863121c4051663a0674aa94937527b2fc40a7f392d2913d4d1443bda278e2f7cf362d499389691d24a2d965ab89a6533d42a157db3ab629a377e83
 EBUILD gitdb-4.0.4.ebuild 1153 BLAKE2B 2349d55dfd87dd61aa440ff413c45e7618bb48a651c274ff8daefdf90f5cedd00ee35e609de92e43a061867f430c52ac2da925859ede5c9c9ecb3198ddb63fb8 SHA512 41e1be5ccdcaa0952f4d08f450d17c35d730f1dc1917a7755a7424857f9984b90ae56fc41c9d11df4d931b6a7c6f4df57e29408a3980e8dad499fe17fe05cbc7
-EBUILD gitdb-4.0.5.ebuild 1156 BLAKE2B a916a2f479c4be5ec802780bc985f35d5e823cc7c23b0f00faf634bee2b4e1c3759cbd55294d0202227f7bfd294efc05954c9e81a1c45c682bc016a080892267 SHA512 2b507c210c9876da1d6487ee36d0daf48a08c70080516dbf607c15717f96a1266e2ed87bb81ec980ec4edafeed1647663bb14160126529858aedeca4ec4cc011
+EBUILD gitdb-4.0.5.ebuild 1155 BLAKE2B 30c6a9fab6c97381e1d54e654c7c53113cc1801fa5e767a24b091017cddc339e874b82abfa87339e4d6c08ccdfaff6fcac51b60f985cf5b1775ddcbefca89b26 SHA512 4a050c42a3dcd29cb12f86e413f59ffba4e80c3ead9cf28b75913111fa165c688cee308d5eda985ecfaf1b85d049591523b53c1b69cfe86acd0ebf4176ea5487
 MISC metadata.xml 386 BLAKE2B e2ecd87d0601911cc37bad5055be83f73a24daae101ca7ef85d948d21251a14028947c285b0812af717b58eec399aee6cbc7a1cd67f58857d090d4142198429e SHA512 b9c7e7c5575d60c1f6f50f5577ca4bb9ba64285555890400edf4a7118d9a7546d71eaffdb9cc222e464b9397496ad832595e8d4f864228421a764b9ae3c3ad87
diff --git a/dev-python/gitdb/gitdb-4.0.5.ebuild b/dev-python/gitdb/gitdb-4.0.5.ebuild
index 16cea188ec73..109ef5fb25be 100644
--- a/dev-python/gitdb/gitdb-4.0.5.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 197f8d84fd29..bdb6eeaae48b 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,5 +1,5 @@
 AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8-r1.ebuild 1555 BLAKE2B 1fc1570f768241dfce6355dddee2bfbd39cc3e1e18137a4c000db85f853e65959c901747d309e11e1c7f380513978147878c1b3c6637820cf850b90aa45bb93a SHA512 6d16de4681dc530bd8ad19b2c011fae91e363a8a852a964bc835a829a2ebcdbbc6ec9b835fc0946488354a1628426b8029b066d6506f35f7af213ae004c1d211
+EBUILD gmpy-2.0.8-r1.ebuild 1716 BLAKE2B eb780df4d33cc2f9d5324664d3dccb99b4caa0f5ea33edd50edb1325de37ac1d422c24ac1db03607bab770061b0b0888ebcc5d2e57f7b19d2acf741d95a2801c SHA512 b61c6485356040af07bc040772c2b1db3667b548179657311db0d706aeb8f0a65d2dff337d3b85c682d54f4338f359833d2515e94fa6bc5450ff5c0bf5a61425
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
index 20eb7743c648..489f7e730962 100644
--- a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
@@ -38,12 +38,15 @@ PATCHES=(
 distutils_enable_sphinx docs
 
 python_prepare_all() {
-	distutils-r1_python_prepare_all
-
 	# rm non std test file
 	rm test*/gmpy_test_thr.py || die
 	# testing for contents of __dir__ is really silly, and fails
 	sed -i -e '/__dir__/,+1d' test3/*.py || die
+	# fix sphinx-1.8+ compat
+	# https://github.com/aleaxit/gmpy/commit/c35c1f3319fcf95e894a59a6d523851bad4abf66
+	sed -i -e 's:pngmath:imgmath:' docs/conf.py || die
+
+	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 479928cdd991..a5045310d38d 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,3 @@
 DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2
-EBUILD google-api-core-1.17.0.ebuild 1187 BLAKE2B 692ac826b772415ff44396c82ef680fe09c0119911439e6dce43c6e924a9271012c8b7623e9da60eefb84cf322764b7c5ae6fba9b78d57fe77999536f894cf72 SHA512 ea5a5c29b13cf0c5ee98fa980ca97bc8cf98aca437443a52e0e504d0017b5b81d17899277e44f4b2ecdef091a91f14b5bd6022c6c8ac2b3f5b4781a59415fff3
+EBUILD google-api-core-1.17.0.ebuild 1192 BLAKE2B e6e10fd8323f5fc863a0c59fbca2622f9bec67e1d837468a078763a08e51ad085b2bc9ea8888c9f6147ec5a51f94f4a0c51c3f4a854ca0205a11a309b9ffea78 SHA512 325c203214bb127259f374a8fb8351196f4221be9b839e21c8be66b376e67d1947319b964ad47c9f591f5e8fec559af6b2bc349cefde6374a202004b48489c9e
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/google-api-core/google-api-core-1.17.0.ebuild b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
index fd4f9c357956..256b57cb60f8 100644
--- a/dev-python/google-api-core/google-api-core-1.17.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 5c33facb5628..30eff390941c 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -4,5 +4,5 @@ DIST google-api-python-client-1.7.9.tar.gz 4142239 BLAKE2B 1754162cd7ae5aa64e105
 DIST google-api-python-client-1.8.3.tar.gz 13537177 BLAKE2B 00b1d46f349a8ad66d08a01da31aed224260ad38f0ee2d7a5b68afe29264234475d28b33cd95addf9f7020fa052e9528b01a4c9cdb73e2ca5742134c4f8f86b5 SHA512 7b9138b27bf032cc1b8beb321459ba5935ed31e4965fa783e472b9483cfd0e97c1da6a34e84fb8c939c462fac462d3f0d853266586ab37be8f890a6b873cf4e6
 EBUILD google-api-python-client-1.6.5.ebuild 1201 BLAKE2B 576e80db7392ff11fc7b3d65ef769ae93ac90957517a68567d0fea4495b0f762d74f2bfa09f05a5f1ec0c7d1ac268fb0673d0eccff1808e92bdae647f49738e0 SHA512 97dff39cfaa8821667295567b3b832033e00cddfc13b9e22442ab528be6f0bcc582ecc5ef06bb8d631086756dcb93afa3284e9985a6c24ec8b922f9d69a3b271
 EBUILD google-api-python-client-1.7.9.ebuild 1219 BLAKE2B 359ad0ee52e34de758e66bc76dc46979791858f369f8da19bb6d7cd593eb02d48702ae84eb02a7aea7b76243b263d617451f8558ca9957feef568e009ba8c700 SHA512 688f94149df1282369234c8ef0eac9b8bc7f2ba353f00f7c40f5aa5881fb1f81734baf98913cfca3151742ef3b3f15c4a7c6fd5713bbb825326ef248fd8ce51a
-EBUILD google-api-python-client-1.8.3-r1.ebuild 1351 BLAKE2B 42d102b51a32b6a33324036cb9b1fc37d26cf3327d065b6fda362e3433a343673526c871ea70b2daf0daeae4447c093ba314747f6433b4ace846a22101121ca3 SHA512 63e9640f6b5015728c192d3f7f4e7c43079ebd58446785f33b6c697390ce71eaf0d54f5184ad14794afa25eff7836249f25df9675b8b9f734d8af4094843542b
+EBUILD google-api-python-client-1.8.3-r1.ebuild 1356 BLAKE2B 44310be2b1e65afd36ef1a3bbf8d2b04abd1771ab2e5cf4cf6fa1a4a4462b50d8781d30ae83c54cd6aaad69d6fb69307603c120f6ac0a1732deb944b6c81a894 SHA512 db78bc80d99fa77ae11fdb868e38a1d36e5198fb2d71dce5ebeff7a69e697dda312187af7d7932b13d8a41c39c604aaf0fd430d8e384729fe23be141b4409ee2
 MISC metadata.xml 381 BLAKE2B 2a802e6c566da699864dd520badb0a91eed1b7a1f26e3f20d6bd6bf7993325d07859034694d7d510984835369ea27a0c25241d9d202b3fc31fa2b52d26e42b6f SHA512 02a4ce0b16adaeaa44e041a2bfc0a4f97eb63914d10064403dae1581e3fdfda93673bb750a60e56b83c0bee46395266f7a5b846dfd65bf157253c733c8077216
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
index 4433c997610f..fe3d45109573 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index f5b403945b38..1cc612a277d4 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,6 +1,4 @@
-AUX google-apitools-0.5.30-abc.patch 2828 BLAKE2B 52f328e0701002fbc95f2749329e03a682a15113c693030cc3648ca7432b05a4975d2b4437a76bb1e40232d8317cdf3db7e3e3a14fab780326526a494fe05311 SHA512 d53104ebded8c19a4ef74f721056c107b7be42c5936215d4722672e8ace02d4adc2d7fb8589d92b3025950c2535879c4e79e1ab43fa6ac2dfa1ea6e48594aa47
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
-AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
 DIST google-apitools-0.5.30_p20200507.tar.gz 365250 BLAKE2B 58d52016775b387b494d8b5897886f059fe74a360098f6527089039469d4d4e3c0d9ec63a12be1215741fd15a1a03e2204f54ace7c9eaf8bbdc8236c9c1fe576 SHA512 94879360c5de3d7405b7377b2baf0fa303c1b0bace56cf75d203b0a509ac028e1d3208a82ba08de7d17e4e26571c9b8601cb07e6897b658eeede9d06fd384fe3
 DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
 EBUILD google-apitools-0.5.30_p20200507.ebuild 1053 BLAKE2B e52b88a54e0140f768849d625eb80208c4bb0831785d4f630bf84ff71f5a350e8c3b3e8dafcd64d77ef588289e457e392bb7da130d33e7ca000962f7d5a254c5 SHA512 bcc2bd37d218564d257f3b72de3200398851a0816fbc2bd9e373ee6700d9b0d49b3433d55bebc835e383d246b3c48385ad7f76297c6a3a183b3e4df3dd2c30ab
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch
deleted file mode 100644
index 32f61a3d889a..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit cfefe5a8322b40c6e7bd3cc794fd644edcc3a6d6
-Author: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date:   Mon Jan 27 20:21:15 2020 +0530
-
-    Import ABC from collections.abc instead of collections for Python 3.9 compatibility. (#286)
-
-diff --git a/apitools/base/py/extra_types.py b/apitools/base/py/extra_types.py
-index 847dc91..e40a785 100644
---- a/apitools/base/py/extra_types.py
-+++ b/apitools/base/py/extra_types.py
-@@ -16,7 +16,6 @@
- 
- """Extra types understood by apitools."""
- 
--import collections
- import datetime
- import json
- import numbers
-@@ -30,6 +29,11 @@ from apitools.base.py import encoding_helper as encoding
- from apitools.base.py import exceptions
- from apitools.base.py import util
- 
-+if six.PY3:
-+    from collections.abc import Iterable
-+else:
-+    from collections import Iterable
-+
- __all__ = [
-     'DateField',
-     'DateTimeMessage',
-@@ -129,7 +133,7 @@ def _PythonValueToJsonValue(py_value):
-         return JsonValue(double_value=float(py_value))
-     if isinstance(py_value, dict):
-         return JsonValue(object_value=_PythonValueToJsonObject(py_value))
--    if isinstance(py_value, collections.Iterable):
-+    if isinstance(py_value, Iterable):
-         return JsonValue(array_value=_PythonValueToJsonArray(py_value))
-     raise exceptions.InvalidDataError(
-         'Cannot convert "%s" to JsonValue' % py_value)
-@@ -212,7 +216,7 @@ def _JsonProtoToPythonValue(json_proto):
- def _PythonValueToJsonProto(py_value):
-     if isinstance(py_value, dict):
-         return _PythonValueToJsonObject(py_value)
--    if (isinstance(py_value, collections.Iterable) and
-+    if (isinstance(py_value, Iterable) and
-             not isinstance(py_value, six.string_types)):
-         return _PythonValueToJsonArray(py_value)
-     return _PythonValueToJsonValue(py_value)
-diff --git a/apitools/base/py/util.py b/apitools/base/py/util.py
-index ac1a44c..ad086e4 100644
---- a/apitools/base/py/util.py
-+++ b/apitools/base/py/util.py
-@@ -16,7 +16,6 @@
- 
- """Assorted utilities shared between parts of apitools."""
- 
--import collections
- import os
- import random
- 
-@@ -30,6 +29,11 @@ from apitools.base.protorpclite import messages
- from apitools.base.py import encoding_helper as encoding
- from apitools.base.py import exceptions
- 
-+if six.PY3:
-+    from collections.abc import Iterable
-+else:
-+    from collections import Iterable
-+
- __all__ = [
-     'DetectGae',
-     'DetectGce',
-@@ -78,7 +82,7 @@ def NormalizeScopes(scope_spec):
-     if isinstance(scope_spec, six.string_types):
-         scope_spec = six.ensure_str(scope_spec)
-         return set(scope_spec.split(' '))
--    elif isinstance(scope_spec, collections.Iterable):
-+    elif isinstance(scope_spec, Iterable):
-         scope_spec = [six.ensure_str(x) for x in scope_spec]
-         return set(scope_spec)
-     raise exceptions.TypecheckError(
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
deleted file mode 100644
index 6003db87a97f..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/apitools/base/protorpclite/descriptor_test.py b/apitools/base/protorpclite/descriptor_test.py
-index fc27ec4..d518e24 100644
---- a/apitools/base/protorpclite/descriptor_test.py
-+++ b/apitools/base/protorpclite/descriptor_test.py
-@@ -16,6 +16,7 @@
- #
- 
- """Tests for apitools.base.protorpclite.descriptor."""
-+import sys
- import platform
- import types
- 
-@@ -78,7 +79,7 @@ class DescribeEnumTest(test_util.TestCase):
-         described.check_initialized()
-         self.assertEquals(expected, described)
- 
--    @unittest2.skipIf('PyPy' in platform.python_implementation(),
-+    @unittest2.skipIf('PyPy' in platform.python_implementation() or sys.hexversion >= 0x03060000,
-                       'todo: reenable this')
-     def testEnumWithItems(self):
-         class EnumWithItems(messages.Enum):
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index dd4655b8e40c..39003d96e215 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,3 @@
 DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
-EBUILD googleapis-common-protos-1.51.0.ebuild 679 BLAKE2B 100ec96c0672efc21df7e91341571089600525bcab3f3591ea6d4122915d155c5dac9f380b44b633ba325a30c967823c1189e83abbb3b18b527d29a03fba27b1 SHA512 cce800f8a21ef4a6d03f18a10c0892bdc43c1138e3e647ad9aae29042914aad44e39a200b5fae468153029d87e6903deea81fb503ca4b9582c8d3a90113efab4
+EBUILD googleapis-common-protos-1.51.0.ebuild 684 BLAKE2B 1eacd54a0f323788ae887ec6e5478ed7c6bf2adf5ee5b2a8d63468f1ad3bb016e74b138e92df788916e770add4f5bfe534bdc2ae4d29b3db97a310c3b896c07d SHA512 fb9bb65b32443264d90b667a3fabab7a999ebfb409d044f2e75e4f364d408e958c3deb7365068f3979228640dd35a651f9c061506150f422a37bc53cc95185e3
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
index 66c187a0f218..16183872ed26 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 9c30c0c81147..78825709ff25 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,6 +1,8 @@
 AUX greenlet-0.4.15-Add-support-for-DEC-Alpha.patch 1794 BLAKE2B b87a8ebb4190c845b18e82b1218fd7c50164835d9280b780b161fadf25c5b2556f443512e10dc83a506dee5d1d622fcc235d0348899f9027d1ca4469dc0d0caa SHA512 d09d5b9f3d6527d40bbba1a0ad4c7b5f7c80078a80a6820e0626ae7832fe78553cf14c0604f126fe4a53e74dc7f14a6f85dc6822d8b19c37963974eebd5b18d8
 AUX greenlet-0.4.15-py39.patch 1760 BLAKE2B bb2c8602c838c2187b3f7090eb49571548962700947c89a00f7e1ac742f5a19ada33a0311b84830895acee88162014b7a3dca3aaf6b4e974dcb73f3d4d07bc63 SHA512 76d205c0e00e1c08976a84093f49c478483cea8dabd05c69dfb138e25879a5eced3d4ff00f1f7c0d34f251804f14d8a73658d2119cdaebbcf1922203014882d1
 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
-EBUILD greenlet-0.4.15-r1.ebuild 951 BLAKE2B e9843a61cd20e4d9e9cd54a65b48cb575f862209a86979c85ae12f37b04f5b985decdd336a7fc89bd3574f58d678c7de7c3030ad36a1cb8d55af75dc975ac448 SHA512 e300b988b4a36326ef9a25bc29cf3cda68d3e6da1f5796925ef379bb6520310a17e299594ed27ce838be04caf2084737b8720357d2ddf3a54e2861636f79fc93
+DIST greenlet-0.4.16.tar.gz 60576 BLAKE2B e0c53af4b6886fe00f0299a1779e478b7cbce5ff733669e8a62757cef49f034e19b7b932e7900b09e288ff4ab7e883fc2dd5f97f78c0e1b5702e5ba9c9f62fa1 SHA512 0dc473c05c1d54a830c009fe8197fd2017b8f3117532af0fc7970eb5abd93a82bbaa1a8403375a0ac7148fcff63cdc3faa663d0c5e442f3dd10ea3b2f98b306e
+EBUILD greenlet-0.4.15-r1.ebuild 944 BLAKE2B 53a91152659fb65a833b02d73f57630ca771f0811b856f103f2919feff0ff37a856d9bdab11de3fc67bfc93e68b512606eec1ee9af8682ca1046615663398b27 SHA512 9662bcd90557b345246db170ac256efd988092cea2b80f26168c2e2cabfb661154659bc76bf231c547bb3e887aa66ad16c2420b4cd0c265d044e8fddd95a2809
 EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf
+EBUILD greenlet-0.4.16.ebuild 844 BLAKE2B 84e8c4c15029350de8722740dac80a9bcbca88e0bc7e4289e2ab85c8d2fabc27d8b97f43d595c4f1a3e5f62e1e9d159412440216394b49ba83fa65ce78a7d53b SHA512 532c0b427004e77cc5a0c82636363d95d8106b7c05d52253fa4e6337ead9c736dfe3c47c86f2478c72b7ee0f1f4db391465a9d520cfc74689ab82c7952a7fe1c
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
index 5d9f0a2d2be3..86dbb7a7c895 100644
--- a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/greenlet/greenlet-0.4.16.ebuild b/dev-python/greenlet/greenlet-0.4.16.ebuild
new file mode 100644
index 000000000000..95b8ec7c7e4f
--- /dev/null
+++ b/dev-python/greenlet/greenlet-0.4.16.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.org/project/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 5c41c5572110..d7e9222708e4 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,5 +1,6 @@
+AUX setup.py-respect-cc.patch 636 BLAKE2B 8bbba520f02c83be4322e6ad2e65f95f23dc475f55b8acea15be341b131f9262c6595d7cc79dcfd0ede7ee3be61139a4c0d74586ffa845ce21dc253fc8e88bff SHA512 22aff2ae63dfeff93dd1bcb23d3f95f0e54908819b6fb7b54fad54b38cd86e62c2f4af8f1248c81516700377971c0da9dea027df99df9fa7d168f720dbac4d23
 DIST grpcio-tools-1.26.0.tar.gz 1990162 BLAKE2B 3f07f5d5be14851a3df276865b9a4d93222f0d4bb95610600ac56efa268e46225c2095d7112612296649bb48afb53a35b73febb3b379f05ea061e269c3546f03 SHA512 d1780a0103b531cc4416b4524c77bd96ab6aac3c081a8ba8c402c10909eb3945d9a3caf4ecc8f9f9c8ae216958405bb98fe1b1874af46407084ed3a65128e105
 DIST grpcio-tools-1.28.1.tar.gz 1986547 BLAKE2B 9f6eeb1e12dbf088a38bbff4daec95327cf86d6b9ac72dfdd826507d6b19d635bb263ccb4aca7577df7f585acaf02a45feebcfe0879c32a1190cac179d8cafba SHA512 b385fc567e8bb5965082164f87c1fafca5f0ec236feef343df92f82862b12ca33ddf9c94a366cd56437dc691ec5a37b82fd0f4fd547e389c6e9bcc7fe912d12e
 EBUILD grpcio-tools-1.26.0.ebuild 709 BLAKE2B 3f97d02b96c6a857ddd0c3892f66f93063646715c42c022f95aea0caebb901069268888ffb2839bef00743e7b72bb5c287e95210a79fd7ae0f8a97fe0fefaa8d SHA512 5e06dee6cb7b8afbc19fbd8c9a557555e2eaef4c0a1e30ab24c5e26f287fef14b5fea02db6c28c4328fe28331af6278fd253470d761c8d501236a20f13f18548
-EBUILD grpcio-tools-1.28.1.ebuild 709 BLAKE2B 3f97d02b96c6a857ddd0c3892f66f93063646715c42c022f95aea0caebb901069268888ffb2839bef00743e7b72bb5c287e95210a79fd7ae0f8a97fe0fefaa8d SHA512 5e06dee6cb7b8afbc19fbd8c9a557555e2eaef4c0a1e30ab24c5e26f287fef14b5fea02db6c28c4328fe28331af6278fd253470d761c8d501236a20f13f18548
+EBUILD grpcio-tools-1.28.1.ebuild 762 BLAKE2B 8448040333dc9089d864949fb1abb1675688c43fce7b06f974261dd02405d5274388456b322b70d82893d935cc8802154566714a2a3aaed4e9b00dfe8e430a55 SHA512 a2f33ff11d7a524707471282d5b2757949d3888eb3755084ad2e5e1e18656021a65f34ebc86b2555fe4843852d018eb576e4346c9fe5b09c358383429f2e6d74
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/files/setup.py-respect-cc.patch b/dev-python/grpcio-tools/files/setup.py-respect-cc.patch
new file mode 100644
index 000000000000..029f96489686
--- /dev/null
+++ b/dev-python/grpcio-tools/files/setup.py-respect-cc.patch
@@ -0,0 +1,14 @@
+--- a/setup.py	2020-06-08 00:11:23.457959701 -0700
++++ b/setup.py	2020-06-08 00:11:54.384652323 -0700
+@@ -68,9 +68,10 @@
+ 
+ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
++    cc = os.environ.get('CC', 'cc')
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+                                stdin=PIPE,
+                                stdout=PIPE,
+                                stderr=PIPE)
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.28.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.28.1.ebuild
index 5f5084a83cac..059e4b9e3b56 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.28.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.28.1.ebuild
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/setup.py-respect-cc.patch" )
+
 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 bc6e3513a013..c379f7e30143 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,6 +1,7 @@
 AUX grpc-1.26-fix-odr-violation.patch 20139 BLAKE2B 0a7e8043a40c2d6edb6ea4620b3cf908f3d7a24f88aa864581ad6b77ebdcb12dc77930510523aa4a3ed21d86ef931749afd723c08f472489546c6cb6d47dcad8 SHA512 de5be7bb5d4923c9d4b14e93c7652b79efbe58c9059e91bbc52367d04eb69113724c659ab1cfab5dc1f437c790242d17008fd7d6eaf38325370d33f01fb2db1f
+AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0cff1ed7859b150cc5865fa59be3410338d4507f1f0cc4ed1e36f8ba338840aeac3de847b43dba1e4a3fd91b345dc SHA512 93ebcffb27c0c30e282d45094cf21f9852a46055122aac37d8f6bdab8ff42410ed234a0c9bb661c05057d41a7c3291bf868275ef57a5e7c8ef3ad1de4ea074e2
 DIST grpcio-1.26.0.tar.gz 15406206 BLAKE2B 4a9031e1d9e9285d1c1ee90396ae339a47715fa2c279f5bce517e3ea02bdc755e3044e3e402f73b3d797a6b1415f58396097a55ba16200c7f9d4569b0b159fe3 SHA512 df3b6787449c202f3e70640907c76231dbbeb6b411167300ba8a53c17f7d45ffa513a81046a4a66a368f2c17c2d57a48a07cb236f44a005e4073bd5d8aa3865c
 DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
 EBUILD grpcio-1.26.0-r1.ebuild 1065 BLAKE2B 18379d743fcb58e3088dd492f5afa5b89cfe438df1af9fd9656a883d34879b0e8cd01d7df720031cb9a6c75b79b24ebe9fb4382bf2c4825c2e43e70eeb510a3e SHA512 3ef09d22052efc55aafaadd6c37643944a3e6371a9b7a77fbdda311d1a322c111c380c420e6d9da66a89675e70961189dc4b6d9da25056a2c880566127a28ccb
-EBUILD grpcio-1.28.1.ebuild 972 BLAKE2B 2281b3464c17c4e1318fbf4e5c517aeec047a35db8cad31f39fb8bf2e1923bf6e8f686a6897c338fdada1af79263045ef197aaffb34915626ba562e83f2346c3 SHA512 3fd1069728ead743b9a77974714d11f7700e07ba63701b778fbbbf5a68117fd64b0683dc041a6e4f163132d73a1f0a2fa733a82d41fa47b4e1c172ad6efa55fc
+EBUILD grpcio-1.28.1.ebuild 1030 BLAKE2B 5bf692f5572afe4db5e878d9c3de46e461e6039a728e40909898dfcde6d2078cf067e361c2b19ed9a81ffc39575d3f312767ed3d31f34bd7daa5e7cd34d03396 SHA512 c32fbf6a8abbb1a131c66520bb1cf92159f3ce9cbbc1a9f10a6872fda11f3262128746cd937d919e241df228668397743ec67866fc6a8782941e9cefd0ecfe28
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/setup.py-respect-cc.patch b/dev-python/grpcio/files/setup.py-respect-cc.patch
new file mode 100644
index 000000000000..545346e8152e
--- /dev/null
+++ b/dev-python/grpcio/files/setup.py-respect-cc.patch
@@ -0,0 +1,33 @@
+From 0a6c58fc0161e697bbf64b4f3d4ef14b03ac186b Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 7 Jun 2020 23:35:31 -0700
+Subject: [PATCH] setup.py: respect CC variable in latomic test
+
+some configurations do not provide generic cc binary.
+while rest of the build calls CHOST prefixed binaries,
+this check fails. fix it.
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2379703eb7..0f92270607 100644
+--- a/setup.py
++++ b/setup.py
+@@ -144,9 +144,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
+
+ def check_linker_need_libatomic():
+   """Test if linker on system needs libatomic."""
++  cc = os.environ.get('CC', 'cc')
+   code_test = (b'#include <atomic>\n' +
+                b'int main() { return std::atomic<int64_t>{}; }')
+-  cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++  cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+                              stdin=PIPE,
+                              stdout=PIPE,
+                              stderr=PIPE) 
+-- 
+2.27.0
+
diff --git a/dev-python/grpcio/grpcio-1.28.1.ebuild b/dev-python/grpcio/grpcio-1.28.1.ebuild
index 3a7c37294781..52d65ba9345c 100644
--- a/dev-python/grpcio/grpcio-1.28.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.28.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
 	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/setup.py-respect-cc.patch" )
+
 python_configure_all() {
 	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
 	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index c2d354bbde91..0845c43c4d10 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,7 @@
 DIST hcloud-python-1.6.3.tar.gz 71575 BLAKE2B a6c969d713d1351bba0cebef8752abbbf0805b4a39eedc918767ccf60d590ac8259e1405a25c2c563923146d52ae1318d6362cbaee311bfe04bea5afcc18951b SHA512 dec3f16197de9f02c2707601e1cad40289d3ccbd6256887da50b84fb8fe6b0fb98f708c9ba0cfc2ff1308a53b9997cfda579df3ec79a1d28686a3c43f4124e74
+DIST hcloud-python-1.7.0.tar.gz 71683 BLAKE2B 43dfda161505d9aa486487a028dff9406e77f3c33efe935c13faf19503d1cd98a136703939408b0faf50633c1a40bbd5c43d90a6373acb38e8a0d61bf715a02a SHA512 d8fac8b74862d5f59f50ddac4f675c409f0bb5b51b16c6db094acae2323214c623bdb459c7fe0e74bb21fc88aa61e551b951cfa6c7de4504a4bf31c7f9481f2e
 EBUILD hcloud-python-1.6.3-r1.ebuild 1222 BLAKE2B a5e15e7099d0a6a664be879f843bb028d4a5cbebf8b93a03e58c8ae6e5c40bdb7bc2eafd44ed7459437f3967a84f63fe08a58cc24d78fd0db9c085c28e95f4ba SHA512 831bfbd3736832e7a2d438aea92be8b9ada98f282665089c2d0f2998b184b4709b6a38a4248bbda16d11dbdb0997299f1a97dbafb1eecb200eec6ec04063c345
 EBUILD hcloud-python-1.6.3-r2.ebuild 1268 BLAKE2B 849aeebb548c084de979afac89a1e4d73ca99e82edca878db75c1148426cd977ec0ce85c15204299f6465cfd9c9920a215b82df3ecf0e42db56acdfee38c7419 SHA512 48ff49f5db26fd81ce7c6a566b4dc24804b528653a42c361c5640e8e792318f0424e0ba27077a14c4bc6aae3994447f55878156c09403abd7f6eb1060a956ff9
 EBUILD hcloud-python-1.6.3.ebuild 1028 BLAKE2B 6568a2dbd9928e71d4d92a1c15072b15fd77686b142aa0cc921755b604936c4f378d3feef37e0c2e6df7ea5ac196c7881cef73b3000d538fa236a474d98e699e SHA512 cb7879547643d1532988135b2c58f80bb99e6515c440ef6c8ff009d5505878890aaff48678c4bbc59c6b2226ddce0b474ebf2ac576c4cdcc37f63c41c1973e21
+EBUILD hcloud-python-1.7.0.ebuild 1414 BLAKE2B f869f16f112dc57f616728842e07abfc9f04bc64ae1c357dbc72632439eccfa1f5218ae2f6a2a35624b36cd52d519609479862aa4e443c8fb6cdc15bc8ec67c0 SHA512 20cf507235650b7a906c4084618a6b298820191fb3562663897cf121d0894a8197f77a9fa91837780303b1e4c135fe1768abf05845dde746b1fa939f621065a7
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.7.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.7.0.ebuild
new file mode 100644
index 000000000000..2f3b9f4100c1
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-2.9[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
+
+BDEPEND="${COMMON_DEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme
+	)
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	<dev-python/future-0.19[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+distutils_enable_tests pytest
+
+src_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	rm -fr tests/integration
+	default
+}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 00f9c14f8da9..9bcf1a6afb61 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,5 +1,3 @@
-AUX hiredis-0.2.0-api-0.14.patch 1220 BLAKE2B 530407c625f8beeef8e879bfa4c6754d45adcccdbeb8cf2b7bda745972d751904b037385ca690d9d77a4c440b86cb7d378be00cce1ce0ab362ba12b22c4b2db9 SHA512 f741d3a8f52d3ae2c412f70c4e63ee78224a2a0bbfdcf963b240f0aba89a8c765f8f1c75d20a50da9304eed96927cc97e0dc83b525982d60889adb36f0f716e7
-AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d3e873e58e06c86e523964f2b79a6c4de7b14267f63f5733313dec32e081133b8413cc36feb5afa61ff5fb43cc0a4da622e7 SHA512 4679b5b45654c22856278c59ddc37b405960504687cd0f055e74946fcc8e48e97d78f44a664e197cd96cc0ed73ada6ca9d48df05e086e98fd2139998d31a7bde
 AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
 AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
 DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
deleted file mode 100644
index c957ad7aa29d..000000000000
--- a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nur hiredis-0.2.0.orig/src/reader.c hiredis-0.2.0/src/reader.c
---- hiredis-0.2.0.orig/src/reader.c	2015-04-02 23:49:10.000000000 +0200
-+++ hiredis-0.2.0/src/reader.c	2020-04-01 13:26:50.504058251 +0200
-@@ -157,7 +157,7 @@
- };
- 
- static void Reader_dealloc(hiredis_ReaderObject *self) {
--    redisReplyReaderFree(self->reader);
-+    redisReaderFree(self->reader);
-     if (self->encoding)
-         free(self->encoding);
-     Py_XDECREF(self->protocolErrorClass);
-@@ -267,7 +267,7 @@
-       goto error;
-     }
- 
--    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
-+    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
-     PyBuffer_Release(&buf);
-     Py_RETURN_NONE;
- 
-@@ -281,8 +281,8 @@
-     PyObject *err;
-     char *errstr;
- 
--    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
--        errstr = redisReplyReaderGetError(self->reader);
-+    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
-+        errstr = redisReaderGetError(self->reader);
-         /* protocolErrorClass might be a callable. call it, then use it's type */
-         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
-         obj = PyObject_Type(err);
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
deleted file mode 100644
index 19d4bd8598ff..000000000000
--- a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
---- hiredis-0.2.0.orig/setup.py	2015-04-03 16:08:45.000000000 +0200
-+++ hiredis-0.2.0/setup.py	2018-04-22 16:57:15.966520939 +0200
-@@ -40,12 +40,11 @@
- # supported Python versions is worse...
- #
- # Also see: https://github.com/pietern/hiredis-py/issues/15
--lib = ("hiredis_for_hiredis_py", {
--  "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
- 
- ext = Extension("hiredis.hiredis",
-   sources=glob.glob("src/*.c"),
--  include_dirs=["vendor"])
-+  libraries=["hiredis"],
-+)
- 
- setup(
-   name="hiredis",
-@@ -57,7 +56,6 @@
-   keywords=["Redis"],
-   license="BSD",
-   packages=["hiredis"],
--  libraries=[lib],
-   ext_modules=[ext],
- 
-   # Override "install_lib" command
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 8350df2c1ba7..58fcc65b1c78 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -4,5 +4,5 @@ DIST httplib2-0.17.0.tar.gz 220694 BLAKE2B 9e9a3c0e3fa13dfc2b58331ba1b52f77ebb86
 DIST httplib2-0.18.1.tar.gz 262930 BLAKE2B d8130dfbbee71dae1319a8a65fb2ae96d667bba08cfc586c0a9239d6bf6cb475fbd4548d6b5276b8001a02417eebff4a7565024d43c630b8ed51e467cdd3de71 SHA512 a1bb527279bdc92fb75bffebc317ff549bb6efb678580cbe40d187921b7ace66b1a5bc1d98bdf065ec5667fe69632da086b0eb201ff911497324fd817bfe1b7a
 EBUILD httplib2-0.13.0.ebuild 950 BLAKE2B 405c5eb3ccd397910dbc997d7ae3652a238465ef9d54dc2b99b762981e4a61aa878c2f89dcf8d8ac99650f51dc59be64d27ac283a1936d53b95353124b7181f1 SHA512 cc67cc96ab139db8fd445edb429c47a8b891c1fbd2558b6718387181752ce27617f3f18cc661d20bd80aaf376e9c95062552f24269e1dbbee8bafb2f9de20a7c
 EBUILD httplib2-0.17.0.ebuild 923 BLAKE2B 603b57487fb24e9f70bd4bbbec7ad2094298bdfe6404eeaea152377076898cfffad2203e4de758a18c44b91728e8c025102bd50880165893bc3490edf3d832b6 SHA512 07dd1892b78409715b982cf4c1e45773486d8e4bd6842781e533d2ba9c7ffa2b28e4fe030c7f080c6cd59f2202d1eb8c5ae1ae3d35e6b95c8fa021719b03d58b
-EBUILD httplib2-0.18.1.ebuild 1271 BLAKE2B 38f2505fcfffcf3c2afc666122bb897dd68c5247892f057bad5339ea22080684d0815c6e202043c0b44f7338cca374d4feb99e08cc2c437525aeb986f6c51971 SHA512 d429c4bcf7baa1a51632fcccd8e7fe4fe2034b749fa605afa20735118358f8dc1785bf2c63e0e4153b60a1a4e2ee37537ffc839728b843010b293148f91fa153
+EBUILD httplib2-0.18.1.ebuild 1389 BLAKE2B 0ce0d890c9ead002e91d39fc14c4706a5f933b3025fc775d32033655b537dcb66a6d5f408609dd59797ee2eefbdbbc5d57004c12af85978bec65463ec54d4240 SHA512 74cf81885d8993291cc403d56b3ae36ad0e44907dabbb2541aa9605cf96f5d78cc60ac5bcc40206ca073b1af987a21899fdbdd2bb79c772f6d960845683cd165
 MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
diff --git a/dev-python/httplib2/httplib2-0.18.1.ebuild b/dev-python/httplib2/httplib2-0.18.1.ebuild
index a88d198375f7..6e298a0e0b21 100644
--- a/dev-python/httplib2/httplib2-0.18.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.18.1.ebuild
@@ -13,11 +13,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-DEPEND=""
 RDEPEND="app-misc/ca-certificates"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
 
 PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
 
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 98262c8b5b78..6af4892a41e8 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,3 @@
 DIST humanfriendly-4.18.tar.gz 345853 BLAKE2B 9b03ea0679f787e216ee78efe8feb77f83562998813718845f4d21b7ce3f42cadff0e80b96f02da3cf6dc7f35cb0714f746940cf2ac0ec8e8981377989650c8a SHA512 01c7ee50d35154fe0b7ad39662ca6ff2dcd3e0f2a2eacc62f0184102c9db1c0fd99257273982aff56710b4e59024e8c20ee77ddd10c68e427c077ed4ca7e0022
-EBUILD humanfriendly-4.18.ebuild 802 BLAKE2B 4b4e697c6a3e6093a4973076fcc80da382fd5045c48fe36a35610454e4893667e4593aef48c73e497e20c0ea806497373b382980377e7447ca05b3df3b57f448 SHA512 275ddb5f2b049f8cc4960832d7af37b6587171a2cad65ec7403f1b7e5832ca9ecf3d91e9e7e996fc0eeac6f7056440c57a9cb9e62dde5d760befa3c2517d70e1
+EBUILD humanfriendly-4.18.ebuild 807 BLAKE2B 0c03c4fc21aa1909fdd84cb53b82ff0ab27d020d38a40ffdfd5d559ae79284dbaec8c09b18106f25bbc79ea9f4024a1af181363edb2e58f3c346412899ba49ca SHA512 7f33d3e52c193d09ff1d58ece09f428d9ae75619ed0aeb9b17b902b0181adda126259fd0e51b444c5186a9d1012ed445db5700aec97ec015ead7327f86259dfd
 MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
diff --git a/dev-python/humanfriendly/humanfriendly-4.18.ebuild b/dev-python/humanfriendly/humanfriendly-4.18.ebuild
index f7b4b4a45d9e..f362db84e0f3 100644
--- a/dev-python/humanfriendly/humanfriendly-4.18.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-4.18.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="test? ( dev-python/capturer[${PYTHON_USEDEP}]
 	dev-python/coloredlogs[${PYTHON_USEDEP}] )"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 43c1c00c12e0..75b1f79af00a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -5,11 +5,13 @@ DIST hypothesis-python-5.13.1.tar.gz 9010460 BLAKE2B 55e3266eb0a48e60963a3a97e18
 DIST hypothesis-python-5.15.0.tar.gz 9010730 BLAKE2B 926433af6c57ee5206bc50ba96275b43c75534a31ab680042e42b4c4b01cb3d55efe76ce5355ed5407c83237c748929e04fbab570f04ad3cd6d41446b90387a5 SHA512 333547ec8433e9190508038f4263c4e65399db3cedf2f5e0af6bcd398ebcdb8614899499c3c6f0395333933b5b7e1d88dd4606243ae3aa8d763afc84bc1831e7
 DIST hypothesis-python-5.15.1.tar.gz 9010924 BLAKE2B a00ebf581781e47fd85fa9d5044894d3f81e1195bbe4269e2bb2262dc70586936df33c4871b4186ff45ec49235b81a4070fc89daa67d2bcd31c98291c12be730 SHA512 d3fdc2ec2d66353da2ee790eae8ecef0bf168320a90556b5877844af975765c1da37a104765a3ca07e3143621be5cb01acfa7d19cc3222a52a0cd6eb63f6c0be
 DIST hypothesis-python-5.16.0.tar.gz 9011031 BLAKE2B 65659f72094ac7fcc82c7e5a8b88c0156345530742412f13398dc72ce50d2466fa9b04b5cf4a79e87916aae770f2a89aa880d1d238890c7f8c8483c4c5068bcb SHA512 66366c172aaed84f1fb5fe0cef4e0fccfa4f65c31a94d52cf3a49b44b535f8366e71974f2aaa7b39d1d1b4171fd92cbfe4bbbac8ec4b9c4ccd2b0e5d15976d26
+DIST hypothesis-python-5.16.1.tar.gz 9011388 BLAKE2B 9d80cd296475846404ded5c466ee50f11957959f08a94a715f80e732da83bc31b66a2bbff2bb4ac1402dbeddda219eada772267f34705b8891137b8d910e5229 SHA512 ea1416c041c857fc184fcce10862d93fce1de888396527d120b2d5f3cd041084d85f8ab4b36693d52786c7162bf41d61c9700ebc4509902c6fcd1c2e87130dfb
 EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
-EBUILD hypothesis-4.57.1.ebuild 1830 BLAKE2B 3b8ac236d780fc1cb2a440a9f407e828f4b922574ae2c6c3b03f7483c5e9adc71ad801d8b6aaa37876c161576dc8c3c537ef62324e4a19b4a6314c6ffae94755 SHA512 fee845a33f461876f0a694002df5e9c15609e8b1dc11fbeb27e6aa95050d64d989f33c4517a8f33aa9e15998deafe880d28fea0cf8c8942d8a42e19e54703b10
+EBUILD hypothesis-4.57.1.ebuild 1835 BLAKE2B e78e8aad70d73ab036ec275cfe0a59c7ba38eafabf3e6a8273fc3a0ec88a8ae60f685d302963eea9e4e5d00c8e4b5ca05f3b5fbaeee3c822979eed460a7e0f83 SHA512 4d3ac5f3919ffac5cb5dbd134d939d71493b2fb9e8414b43185336e78a4d4a62f74c829efa512e32440ac4892e2857611f5dd1d076dd8469a477fc132e0d5834
 EBUILD hypothesis-5.11.0.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
 EBUILD hypothesis-5.13.1.ebuild 1593 BLAKE2B 4f3aeb8b3378416bd0d41f817253ecdf3049367ebf1b526cde16eae4dff1a68d0cd283d52d471a1f29fb01a0932f309efba5b8e900122025d88e197d665027fb SHA512 b8c36cacf2716ca28b7b3d5acd15e338f6e5db6b9046419fce286b40a4aadae1fcc151861cdffb6ea2fa24151299b4972931423b4d01d13f941dc174409300be
 EBUILD hypothesis-5.15.0.ebuild 1593 BLAKE2B 4f3aeb8b3378416bd0d41f817253ecdf3049367ebf1b526cde16eae4dff1a68d0cd283d52d471a1f29fb01a0932f309efba5b8e900122025d88e197d665027fb SHA512 b8c36cacf2716ca28b7b3d5acd15e338f6e5db6b9046419fce286b40a4aadae1fcc151861cdffb6ea2fa24151299b4972931423b4d01d13f941dc174409300be
 EBUILD hypothesis-5.15.1.ebuild 1595 BLAKE2B 6fbaf4b3a84adbfc6eb1251ba1df555904e0bed0013df52891d3d2d9f99e97d01e3f6352ea931d30aa6f5cf340ff82a338fda1e12fd94dca22263559ac077c29 SHA512 b603470e4d701a878bf316e6678a93d32ada16ca5fa39860f3a3f3a7cb5b12e9862580a80cf30380933d03ff9a2df7711013c9a4831f5d2572df5423b6beeb72
-EBUILD hypothesis-5.16.0.ebuild 1602 BLAKE2B e2bed95c43265bd99ad6021dd7ff85d0dcabc5a16421f683f60c2cc49a1bbdf2336944f6e6efaba88ed20b53b8d5d1c3bcc88f0a8719b3de5631aa30a8f49f6c SHA512 0d5103364359b06794a4861984535e6489112f1b780d04447a5d63dc70d07be77954b683e1bb3e032eb24ab85bc4f1da1b9dddf791258e5a4b9b52f649ba46d4
+EBUILD hypothesis-5.16.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.16.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index 67c5098d00b4..d917ac98cf90 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.16.0.ebuild b/dev-python/hypothesis/hypothesis-5.16.0.ebuild
index efc352f30c74..494668bd6a8e 100644
--- a/dev-python/hypothesis/hypothesis-5.16.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.16.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.16.1.ebuild b/dev-python/hypothesis/hypothesis-5.16.1.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.16.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 63d49a8893ed..a848bc01d38f 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,3 +1,3 @@
-DIST idna-ssl-1.1.0.tar.gz 3377 BLAKE2B 4a3baee5c976bdde4092eb3a980e555a72fb74395d3bc673ccd6e986e003b696cabdeb41061ad9b5f8da62074c034e4a07298fa993d5fff185f723ff4cb5f432 SHA512 f9db74cecabbbfddfd1817bbd8434ef2aafeea433c3eefff3f94c7e994da40e3f315fcda527f3a0c3743028f26bbc934f1dd21f94134123c3271975d0527cd35
-EBUILD idna-ssl-1.1.0.ebuild 537 BLAKE2B b203d4ebfa0f9a091730f83c03e5d47c7f57413505037129c9026350c35dec427ca7dbb9e29e371dce0bbb552f601a5c2aeeb59589febd06cf1ad7fd4b418f2a SHA512 13b1170c089edc01391f05ea953c53a1212092b8ffba4558b99fff5397427c64056dd4c11c24e9f05d6a9583148b2e2718c438b4a29dd1bcda9c5c8385c8d2fb
+DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
+EBUILD idna-ssl-1.1.0.ebuild 825 BLAKE2B 631e604f1064966205e4e25cc7341ec1ceb776fb2773d581536408b58c9654afa3e33d1ed3eff28e67471795a949958d38d47e45ea5e2aa72249c3e086a1f271 SHA512 cca61d4b7124cb2fcc0614e15d74215c7142f3f751e8c2ee45c8e956040edb17cd55a327d99e62f5aa09b2c7fe4191816330bf2fc275bfdcdf945e5c0108fa92
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index c4270a8e234a..c80202c1db5f 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -1,20 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
 HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/aio-libs/idna-ssl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/aiohttp[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	sed -e 's:--no-cov-on-fail --cov=idna_ssl --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+	sed -e 's:test_aiohttp:_&:' -i tests/test_base.py || die
+	distutils-r1_src_prepare
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 16aba8b08403..5225b0c0c457 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
-EBUILD imagesize-1.1.0.ebuild 571 BLAKE2B 4880de9300501574bcd8833c1ab902e310c62685e569e47d60a8d5d2a195e47bc3ec981bf0cd82d6a9e4024cecbafcce3922a808d2ce491cbceedf93a0d687f2 SHA512 15015d8022deec5aa1aa89c217db645f0e7c7195cfa1b014e824ebd2e5387d30e063ba70e840b01c5c9dbf68b29a3d0d50f054260cab4d227d137ac96b5d6208
+EBUILD imagesize-1.1.0.ebuild 519 BLAKE2B 2027568477fd5bf5cfc3c3239642584e69f17a959b07d3985dcdc93742e849fb13b1ee4132eb728460015d634c205194f34adf13323b4b164633c6d9ecca6bd0 SHA512 5c15e60e5579dd7a1506ee25ce03281fdbf1e5682b2bcdb6be92c31bafe0f20148bfb1826762a9e31ee2e5d48164887a3f46bb4ebede9ec19e10d8a40a07c750
 MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
index c1adf98278dd..949c9fdc6f5e 100644
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
 
 inherit distutils-r1
 
@@ -15,6 +15,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 6a41b53895ca..6b5bd4ed20cb 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,3 @@
 DIST immutables-0.11.tar.gz 76589 BLAKE2B 64d7ac89dfe680d1fe78704c165a1fbb15559203980f1a8edd65fbd74589bf2038c799037189849a917555a67483e0cb352664b1d44f3ce161db6c88b878ae5a SHA512 fceb1feb5fd8de4444681cb89c6692206042d0f8f404d78848c379ca3afbb07425e2ba875f7b7cdb42bf126ea0b9f682c0b873c4867c5266cc77da28d29f6ab5
-EBUILD immutables-0.11.ebuild 470 BLAKE2B 9c70a9bcae6b8a4acbc3894fa20fb164e802c7c92797baa90cd6471ced3b589cbdc93abef0462c7b1ca04beda495051c3301c471dbb990dfdf8d282addf59618 SHA512 6d4832764860e5df6a5411c4afdb4d96b417910944c27f6ed9f64e6136db9a7cb080bcb1ba8663ee0ba1b27e983a45080b1efc0ec05d58f5e66b03f7eeebdce1
+EBUILD immutables-0.11.ebuild 468 BLAKE2B 5bd912a30a0c5790e31ec75fb043a175e03f4fe56069a83f2b9d9aa93f81ea2180d42c26f3bca69b518679bcc27c9a1537d5c83316d608a4aae5a3e9f555f78c SHA512 f40c4f61403120cacae1d55f0ccb62a937352c46cabe7d75a3054dfbeac3e7a2ba65dcfa2c53ff673e0d2dcce973fad683772f52037cac93130b1794d989a26b
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.11.ebuild b/dev-python/immutables/immutables-0.11.ebuild
index d63114370c19..17e029c35a1d 100644
--- a/dev-python/immutables/immutables-0.11.ebuild
+++ b/dev-python/immutables/immutables-0.11.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index b0d9d2d11d53..93c2f1d11294 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,9 @@
 DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af3fc833a0cfcad65e522d3034022c20ab382a02b232cf3b365bfadc971d4a150b93d7e3b0ada7645dd33f201ffec976117fa SHA512 859faa1ef9cecd6b2ae88fff9d90d72e54e6f0ce3025b09e8a22d8f2b0d7c204c4041aa6a1f35ce79751b04ae482e406d2157f9296d4f8b579b5b29591b39089
 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
 DIST importlib_metadata-1.6.0.tar.gz 27136 BLAKE2B 55a987a75c78ff39fc5ac5d586cc7b7f9e7340edce505387be22cb291b53dec87e4f362bdb3f9a13f2797b6806f783b3cf0858c9db298266379f706402a43331 SHA512 4108d84a39da3c892a3b448027cca2835f6a68ac790b51b7cc4eb4ec925f5e8322847d86d8e89fbcec474258f592220f283116c82c536130aab70b96cea0435c
+DIST importlib_metadata-1.6.1.tar.gz 29039 BLAKE2B b193afecae1458b0d82fad0fe00878c17f8fa279d8eb43ec80d189d3f33b217fb376023c92be70027579484bbbc9ef949ca75f19660a40275d96ef88e1f2aaf9 SHA512 f5537d80bb72cfd97269e2d83b059fe1085e41ce9cc7eaac30abc819dae4b118bdfd2d17989b693c05f0084b2bb86f73837788087915c94724e8e5344752b626
 EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a2efcc549cf1bcc137066fed60132dff4f557f4b856680f9b0b999464bcc1899608e039fb159e15ea2a53c9b9217995863018 SHA512 e5af262c03a8376c09581f1b17a35a712de9d82e8397db067db7415f73242fef147f490bb2bcab5b108bfd3a7e676a14ec5490e018d9d16010be9dab53c4013a
 EBUILD importlib_metadata-1.5.0.ebuild 1108 BLAKE2B 2bfdc004450287617f23b183ac7bb52b46463b1894ad761294b2200d0de8244e00481372b7c5ba1fd3ea0472dcb1304bb29390f43b9d02ef07a44901f05dfd62 SHA512 267ad2f36025556162b81e3465b7eaf3baf383a06928b4799e044a309698c5e4196c0cd2483245fc45ee6d16fa930a1607789077fc1213b05826463a6363e828
 EBUILD importlib_metadata-1.6.0-r1.ebuild 1229 BLAKE2B 3672433212a43e40b6d7021586e6f6a09954a6a38b785463ab39fb56612faf05952100afd7b9c79e991f303c505b6deee6bf0013a9e2861e53c7bae36e575df1 SHA512 55abc3d9561efcbce67f47cca55458b268faa147c468ff788a84d263bd5e3f20eef3ea607577418b382c3dc0ac596d16871283617d327d5bc67f9b0a2126506d
+EBUILD importlib_metadata-1.6.1.ebuild 1341 BLAKE2B 8ca0bea280ab637940922dba9477f95ef9885a35ae0e56502e93a70f1eb4ffc760fca26d02ee58e827ce8d29e735ee39ce9cdd14a4d4e81402c924e61ce2d6e5 SHA512 741f7efedb7fa390e2ffc6fe70c827eee7105fbc81a10f4c48e6d3040a0e683a17fb187559b155b1fedc0bc5995a62f9e9d85e5d4285e398b3b43b3bdbff436d
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
new file mode 100644
index 000000000000..2dd30d987f03
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+		' pypy3 python{2_7,3_{6,7,8}})
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx "${PN}/docs" \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# remove dep on setuptools_scm
+	sed -i -r "s:use_scm_version=.+,:version='${PV}',:" \
+		setup.py || die
+	sed -i -e 's:setuptools-scm::' setup.cfg || die
+	sed -e 's:test_find_local:_&:' \
+		-i importlib_metadata/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 002b02bc1126..33dcbce45c5c 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,6 +1,5 @@
-AUX importlib_resources-1.0.2-skip-wheel.patch 305 BLAKE2B 741e9825c64a88696603d31d9b749fcd3756bcb44755730b12d22afddf911d178365904885d2323aa5b331f44f20b6e3306ad03adb60794c6c83cd1b0795c902 SHA512 6e3f90b1544c6de97768aaae708d1bc93494dcdf1cf10d59e48b55406c9a6c9bc9eb5f5c0d034bcff99eae5274c1f1a467a9bd2a4292f0eadf0686286b879f77
 DIST importlib_resources-1.4.0.tar.gz 23220 BLAKE2B d494615ba39620e772552b09637e280e0b72b16352387592423f824b67af315da1a0749e0dde8e55d3e0e04848a3c43802c12f20c79c5a067de0a3299510a199 SHA512 e482f109f387de79d66e69084fab70750ce472f7d665c3a617819ab604e376860c2832a0cab27867165b7ac60947db554ec686d73f182dcaa6935dc14ca3d935
 DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
 EBUILD importlib_resources-1.4.0.ebuild 1274 BLAKE2B 0ba74e406c9d5f2ccec9f67c94ccecd96dc7a6d2905ae0c0183b8ec46bd9dff66dc1b4a3f166503900b04e5ffe931557bc0ed6dceb212b913e28b51c6fd7b441 SHA512 b376967818c52b3f023fe980f53fab238154327bdbe26fd70ee2b950b02a908d669f888f4c8cf4d7912761bfb625764f86d59d95ea0a7fd297fcba508c76e3fb
-EBUILD importlib_resources-1.5.0-r1.ebuild 1281 BLAKE2B 71c96758a803287c70634d9205f6608799efb5f0a1847d5a4f39c27263c9fc8ae666584be62cd52b54db13772a996ea6501aa06c360340c7dbf8e848a16775c3 SHA512 c38a6911240d529cfbba4def1d9b9f67b0ed1a0ca86d0763ff0a02a74829079911eeaf4c959b4481f4f44820520ada932e0639fcf38db47bd27f9fa0f219069d
+EBUILD importlib_resources-1.5.0-r1.ebuild 1280 BLAKE2B 16db4dff815fc1e5dd034965e42a9d22f0f7413281856c80aa7652003799c2cdb928a8a6143a5d1d3d31b7f1dddb7ae933afe3bcf30a6d838ddaa290593b5cac SHA512 3c4c2aead9af6c6f44acde1b976bd8a853993ef1813cadff7986d41f4b627f697817e65d0ec2bdee8d6fcf3b618c3b320a3b179d8df9c4445dcc1c31d21aa837
 MISC metadata.xml 895 BLAKE2B fadc4adcee6471eb31d5a1b406c9a6a29e366a50abcee105a08456b432e9a42352afdf7d08f37c3ee6100f1f57080bce2a32770b3fda96bedebfa7958957975f SHA512 6802c03cfc8049146dbbef1ff6462cb2eb01f18048a857ff0050af8e15367bff8e40521c989fcdc68c95b2025d2b7af09015f99c279ee504d556165687d7fa36
diff --git a/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch b/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch
deleted file mode 100644
index 1cff1fafeaf1..000000000000
--- a/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index c9ef791..412b1a9 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -19,7 +19,6 @@ classifiers =
- python_requires = >=2.7,!=3.0,!=3.1,!=3.2,!=3.3
- setup_requires = 
- 	setuptools
--	wheel
- install_requires = 
- 	pathlib2; python_version < '3'
- 	typing; python_version < '3.5'
diff --git a/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild b/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild
index c62c254de432..65027c9a021d 100644
--- a/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
index f577e58cd722..97f6f4617886 100644
--- a/dev-python/inflection/Manifest
+++ b/dev-python/inflection/Manifest
@@ -1,5 +1,5 @@
-DIST inflection-0.3.1.tar.gz 12943 BLAKE2B cffaba9dc22444abda6cef04bc7dbd420abcdc0edca5c13bb734edd72aab631a2b50d3c37f9bd914cc8956f8afe951734db764bcced9e0837bfe75a90c527f73 SHA512 2a69a6228f2d44a5afecbd3ef51a51b4d5f63f69ddc844f4abfd6f326cb25c518403e8c5b9f98589885777d41d8fea31bacab3a5a3ab80db411960238d2f49ad
 DIST inflection-0.4.0.tar.gz 14536 BLAKE2B 18e76db58d36cc1e3b9cf60870f4ea5759d050e7f0a5bc80206e712a51cba32fd1381b602b33bcd2b9763b899681d4d868ed930d5133d029d91161118ad68198 SHA512 1fb4321701aa0d36152044e732de679629c0b72052d1ab14d3f27356701f48a51589283d6ee821d8c0afec5ce01389a67d2f6a435075120e80b2da96e49e9159
-EBUILD inflection-0.3.1.ebuild 878 BLAKE2B 354ebcd50afbad7db6bd4be045f6bc9c9d8a9495785abc45f92f29c74b33b63cd32163b14d724c57d68f799d8b16ba3ce2cd018407cb0d0f76542dabd21b4037 SHA512 56930b13ffabaa2c15d48a17f88adb6ec75529d056ea387ba40686725dc77d6e6fb81bf685bf8e723a9b52b529133fa4bafdb0fa3812048a584b38cf671bd702
+DIST inflection-0.5.0.tar.gz 14830 BLAKE2B 0e3cbac92b823de37ce99837c82d3319a61d0106eced561d2607ed0481db023059401a313478465e25fe16057df956554f01faa4d77f574040ffbe46f4b53afe SHA512 6d05447eb65feda1830b22b6409dfc7f7e472b5a50f2fc92008393bb06dd148471db4d460b683cb78358e755a86266b4db039bd10fc21d1cee26632d76cc0c70
 EBUILD inflection-0.4.0.ebuild 443 BLAKE2B fa5b067237041a7b03b7f567f983f14ace74d2bd53d3ea60bf18c6abef7aa28a0f71346f1d832699f273fb2251654f2750617fd4f438cad6e9c5928ade8bf971 SHA512 7a210776cacce08526a7967d771053540b92e0e2ebe3c2f830d937015c9616a060a37e0fca24cf564e7f18300468e709ea3061e4626feddf6912642f326da444
+EBUILD inflection-0.5.0.ebuild 445 BLAKE2B 46af3212c59aae45b52b3a54fb67d6647813b736d930e8deda8004b963927d570039727bc4fa4ec45cd72a5e381a7bc261c0d290597e7acf62327c20bd5ecbd9 SHA512 db7513619489bded9703bf4c58ef4befe5f894945aa1368a7471373ccce43a63bde7260d828c0c1db964e97ad971fc9a9c86d4cae906fe3fe9d1eb4a2ddd3b37
 MISC metadata.xml 444 BLAKE2B 8127165e52bc2ba190021733ea594cf8da0bf3f2d878fdc191cda3354d2093c239cd5bd7fffc0c2bfe3055eff103da4bcafefc215576a28cb83e852aeb43cd57 SHA512 2175dadc52b8a381bfcbcd3a390d99f8582aba44870c29f5addf25880df9336d9bd16bd2120ad283359693fef2b0e65b7cae315fe17f042c17a512ea0352c352
diff --git a/dev-python/inflection/inflection-0.3.1.ebuild b/dev-python/inflection/inflection-0.3.1.ebuild
deleted file mode 100644
index 0d2db3a146d7..000000000000
--- a/dev-python/inflection/inflection-0.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A port of Ruby on Rails' inflector to Python"
-HOMEPAGE="https://github.com/jpvanhal/inflection"
-# PyPI tarballs don't include doc
-# https://github.com/jpvanhal/inflection/pull/12
-SRC_URI="https://github.com/jpvanhal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflection/inflection-0.5.0.ebuild b/dev-python/inflection/inflection-0.5.0.ebuild
new file mode 100644
index 000000000000..83ee317c8485
--- /dev/null
+++ b/dev-python/inflection/inflection-0.5.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A port of Ruby on Rails' inflector to Python"
+HOMEPAGE="https://github.com/jpvanhal/inflection"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
new file mode 100644
index 000000000000..19e603acc746
--- /dev/null
+++ b/dev-python/influxdb/Manifest
@@ -0,0 +1,4 @@
+AUX influxdb.conf.template 476 BLAKE2B 50416cccd720729d28b50d6cd4bcd6582c959b932c75f8dc64525e96be35242cd8dd36b3f689383e22b0eed3925b0c97dc42dbaabdd76dcc3cca4d5f49d8cc0d SHA512 3b8f9dfa149ed0e8aa25c8db8b39968e01ba7f81b9db037a0e05740c27d617dea8101efc9b9ddb00bf354cea7eefe5ad318b2ba309276e5ba4500bc3dc9db62e
+DIST influxdb-5.3.0.tar.gz 66683 BLAKE2B 28dd955fb26eb9a984bb910f26655720c566c08a8178f8aa08b5eb66a6f02933a6f3cb2d26981ffcfc3fd9a017fae2ad27b61f32e2a7916c55d723ffea5b248a SHA512 49ae48dc56ea8f6c6d4103f33207a35af4877c292ff4bfd32ebf8ff35fae816f570e64657406fdf9ef13092c69e7e2d1f0c641124445d35731a4a37812f67242
+EBUILD influxdb-5.3.0.ebuild 1117 BLAKE2B b6ce42212120f644f74402a102c74635b8f6c6ca4ade589d37ef6ed398006144bd1b60adf8a10baf2a25fc3422f7997a0a823a88b926038549c7f6118f892817 SHA512 d6247ba8169e4d372c59a70dfbab69a77241cae8fac5d6e4067675067bb60e46f0acaa412425cfa1e4be38b96ecf330363dba7fa10b1fb0eb21fbb28e6fc1f3d
+MISC metadata.xml 497 BLAKE2B d0626d2e8a84dae9647d13d9cc6971ac9249d0b77352cbcf0b081460412225f6854770d4eca768725aa57b329bd9213f0c4db3cb5b5bd859a604b9826abe3fbc SHA512 49f6810c70b348acab0cc59581a7e0cda7d798edc68f34127c7eb65c6f70643f281de099b61efbb7af1787db2d9ae7f49d1bd45b1cfa7e2ac67737e743a45cf2
diff --git a/dev-python/influxdb/files/influxdb.conf.template b/dev-python/influxdb/files/influxdb.conf.template
new file mode 100644
index 000000000000..efcff78aa6ce
--- /dev/null
+++ b/dev-python/influxdb/files/influxdb.conf.template
@@ -0,0 +1,29 @@
+bind-address = ":{global_port}"
+
+[meta]
+  dir = "{meta_dir}"
+  hostname = "localhost"
+  bind-address = ":{meta_port}"
+
+[data]
+  dir = "{data_dir}"
+  wal-dir = "{wal_dir}"
+  index-version = "tsi1"
+
+[http]
+  enabled = true
+  bind-address = ":{http_port}"
+  auth-enabled = false
+
+[[udp]]
+  enabled = {udp_enabled}
+  bind-address = ":{udp_port}"
+  database = "db"
+  batch-size = 0
+  batch-timeout = "0"
+
+[monitor]
+  store-enabled = false
+
+[hinted-handoff]
+  dir = "{handoff_dir}"
diff --git a/dev-python/influxdb/influxdb-5.3.0.ebuild b/dev-python/influxdb/influxdb-5.3.0.ebuild
new file mode 100644
index 000000000000..84c5acb0015e
--- /dev/null
+++ b/dev-python/influxdb/influxdb-5.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="InfluxDB client"
+HOMEPAGE="https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="test? (
+		${RDEPEND}
+		dev-db/influxdb
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# The tarball is missing this file.
+	# <https://github.com/influxdata/influxdb-python/issues/714>
+	cp "${FILESDIR}/influxdb.conf.template" "${S}/influxdb/tests/server_tests/influxdb.conf.template" || die
+	default
+}
diff --git a/dev-python/influxdb/metadata.xml b/dev-python/influxdb/metadata.xml
new file mode 100644
index 000000000000..dbf971953bfd
--- /dev/null
+++ b/dev-python/influxdb/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>bugs@chead.ca</email>
+		<name>Christopher Head</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">influxdb</remote-id>
+		<remote-id type="github">influxdb/influxdb-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index c3b6b28dec04..ef0b8cda16f2 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,3 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r2.ebuild 680 BLAKE2B 670255f1e642bd7a1c2274cb8652ceecc32d8da44daac45ab41697d39191c6ed7756892c18d0c8ae3a3513aca24cd1fc9260d68271491467a408cbb01da2926e SHA512 765a63c63b5992136f261e8d8c73cb9e87f59bcb51313722752e1d5d58929a67b4a343826717773fc2318136338718487b927f3c87d0e6719a07987f66b0809a
+EBUILD iocapture-0.1.2-r2.ebuild 500 BLAKE2B e0c96dd6b4ec96020c0c7bcdd0cb5129b6ebcc5217a00897d3f737054f24f220e88ae95fcdce6eb8946a4478f8ccfaa234de5d2029c705d0d5303ada37f6c8ec SHA512 2856f81a48ca5f959e058044fb8451128bc9859c72403b924251d45e6e33c359a4cee9af7ef72190f8c3f9518bfcd3fbaa921dce07a73b47d7fcf6dfe742a5aa
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 3b9cb84cb71f..216c2210675d 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,17 +14,10 @@ SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 LICENSE="MIT"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		${RDEPEND}
 	)"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 54e7bad10492..e23fcf8970f8 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,5 @@
 DIST ipykernel-5.1.4.tar.gz 108592 BLAKE2B 9e009bc2d251b065b1e6e72fd5dfb1aeace9fef094a72c76b96814923cefeb50b214032a125936536b34209e7a1e4b68fac270f9000862fcbafac2f270266916 SHA512 f9552526fece022192a90e4a263651cafe54a609424df578b0549cc663af9981e746a6132ff5e646c6a7b429335b92e7335272d7870affaa1a1846a4d39e09bd
+DIST ipykernel-5.3.0.tar.gz 110977 BLAKE2B 4ca23618e25cc4ab4d6e1b0725136594d995eda91bd804611d1707c81437bfa0eef2b0995eb2697f28b119696d7493f6ec8e0c21e0cafb6e791a35438e8dd464 SHA512 c36a6dd4d9dfd52d31a8a37e10aea3c67a7a523ab32db8fb8904f4d90741056d946c265c57354be016d0fa1e4a34f4722c26798a3a7d6b6992884bdba8101190
 EBUILD ipykernel-5.1.4.ebuild 831 BLAKE2B 6e86274287543c6645ab4ad83175e6561bc6053ac54b6cf31ee397744c6eb8f74e03e897021ec1ba90cd5f2dc19a1ad643eaa06151bb41057b2664a24d0d7809 SHA512 b9d762eb0bfd0bdc0bb077cb234962f4b572c0e7e0e8befca4a3f0e0a99c6ed9c812028b0c15d4e178aafb0358090ea8be96f61b815ec53d4cc1c7f457442b8a
+EBUILD ipykernel-5.3.0.ebuild 834 BLAKE2B 4946c74da694b1d30f0287bcaa71c2cfa4acd8b516e53ce1040ce9903b116b9981e753fe7fb543a6604c9486f69e74ba8129759a05fcf831eb1c49806d9d6c53 SHA512 039bce41a7d824fe0a651d1ef44c1e035e3e6b4f34ae091aff305cb941f3f2a670ef3524cd64baa9bce0026f802f26ee57109cdffb3763600cc8e838ef27fb18
 MISC metadata.xml 501 BLAKE2B 86da6845e84d32dc9571aef5828ed06703c942882a34b2392cf83d3cd2f59a01fd0d353445e67cbd45a9479ae1a8600a0c4dabf72f68eca0985d1f3423a146ee SHA512 2f8e8ee7fade5fb1c4b1065a1176cba942556bebb417824a900fca11e467ba6dc54a6ad4e49c0c0575bed769abf01fe52a9b6c0c090c7a530e8806226fa089a7
diff --git a/dev-python/ipykernel/ipykernel-5.3.0.ebuild b/dev-python/ipykernel/ipykernel-5.3.0.ebuild
new file mode 100644
index 000000000000..5504b53c5963
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-6[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 8804bdad4782..37ecb888118c 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,4 +1,6 @@
 AUX ipyparallel-6.2.3-disable-broken-test.patch 1063 BLAKE2B a80674390818474fba63c0b86c822eab8238713b96b2d6713478909da57bc4ee1c5bd1fa5da9fd7baff8d84b3ffd313540ed8287bd1c19dbeb61dd69bfe53dbb SHA512 c45c51b5c3fc1512d6bbd7bd557a91de50a1ae172ad465bc4f5482d6036f287ad17cad20406fbd51d8740eabe11a50584040c362c32f1770db69f4cbd9984681
 DIST ipyparallel-6.2.3.tar.gz 2371030 BLAKE2B 73f96bbed280def33ae243e592ecf2e298afe92287cf3a7edb966859c38c6dcb1f1a43082ab83907aa00e06d571f4b750df28e6885a1c2d1fd1489fd4472a7fc SHA512 ddf479a7776c2ca9fd37aa5b7dd402c136ce62a479333f5f56dce413649f9b928daed56c173ad5325268eaa58667d611257b20c8269899cc06ae2829f973b4c1
+DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
 EBUILD ipyparallel-6.2.3.ebuild 1969 BLAKE2B dc93cc19091299c4b07e55a7068226e3239a5b3d4d32e2ddb15c1ff4a9cb6c6d6b572a5ca172cad3c59043e5c214e0c6f15dafb3d4303d8be70eb43047669028 SHA512 ef6dbefe4d827f5bd399d90a4b75a2be0b77d000c4973453dce17e26f59d45cb2a3afdae5964f2652e807079f23e6410aead5719fe54d218c6fd1b4d9ee277c4
+EBUILD ipyparallel-6.3.0.ebuild 1721 BLAKE2B bbfc1fa1db531de92835c5400ba27d150cb47e1d02a7eddaff11ed65bc5cffd8d055f9486d7ac68dc12e5c953e68fdf59ab709498feb6a70dae03fde6bc7a5f1 SHA512 778ed1bedc5a2a207dac83f5b08f3a66d9589f28cdda769a621e838b7afe74ba3d20faa1df770f59bbf452f71805b688bc641d6e2ba48cacc378ea5026729df3
 MISC metadata.xml 505 BLAKE2B 3dc8a7d01f8d67619f064ced47674ad386c81e625d46b820a7949dcba68755ecc69d29166880d80ba8951bd5226d6a380fdb0545287c527a133c3645b6f2bee5 SHA512 d86601139ae4a5d2aaf7d69fdfd609450f12d03775276bb0b459728712a15803d7c3a6ec3eb73ca7a0802e4333809f2eff8f9ebc2dd2a2c22947262b78c3dea6
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
new file mode 100644
index 000000000000..e567a97df1c1
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="https://ipyparallel.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# About tests and tornado
+# Upstreams claims to work fine with tornado 5, and it's indeed possible to
+# launch a cluster with tornado 5 installed, but tests definitely don't run with
+# tornado 5 installed. Upstreams CI runs with tornado 4. This is why we limit
+# ourselves to <tornado-5 when running tests.
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+BDEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/ipython[test]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: investigate
+	sed -e 's:test_unicode:_&:' \
+		-e 's:test_temp_flags:_&:' \
+		-i ipyparallel/tests/test_view.py || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "Jupyter Notebook integration" dev-python/notebook
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 3ba7f3bd0960..2ef85ebd5197 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,4 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
+DIST ipython-7.15.0.tar.gz 5245923 BLAKE2B 36c9712c72a38e918403cdc91fc098904282a48faed3e7faf03a1791356d09b9953c080b1b6f73b958713984748ee8af6d586956ccdad3ddadc60292cefd6d83 SHA512 46b09a8b6e5611d7b11b26aac475e7b823b00653ea6a3bf1a66d294cef22762b38e63c79f1e4e9bea0fe3e6423b058a2a692dc544c082dca37b9bb91c816cd22
 DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
-EBUILD ipython-7.5.0.ebuild 3534 BLAKE2B fa76144a0d7dc0c1b3a4236295980729ea83a47e7efad923da4b01c8fc9f677ee04b02cb21e2a44ca05a810869f1e73ec8297e1f605ecb9f18b77ab2317e9099 SHA512 c373c567c2172ac4a6f2b202aab1567ea7492173e96da268ffbe6c3b8c3b34d1cb09ca52ebdd8a44408f307765369fde80d24d223af8908bd65e17eedba982b9
+EBUILD ipython-7.15.0.ebuild 3624 BLAKE2B 12e457cb52c926d5a2ab169310365b17202e34f502f6b76c8c3b38fc0e5699e250060576877c384802f2408ee670532544dd455808bb2f02d52e31a5fd3299c2 SHA512 0506305565cbc67e701a6b80776bd48e67df26523f16d1d6cf5788c58d16854c4b2a6a59cb6419abe5a60b198fe707b6b1e8eaa030431ee0219a974a6f8e914e
+EBUILD ipython-7.5.0.ebuild 3571 BLAKE2B cc3f3e60012b2f432d94b12d46e51723e31905d7536467efc031ec130afe1460ff17eafa6ae8c601338714ca0a5862437dcc95919c85b54c2cb0892a6cac4dae SHA512 044290fe2202ed785ee10f8809475ab25c4dda5ab3d5de43d345860a809d5a7dc4a90bdd335d2d1ffbc7fb482179cca55d0981d3a63a8e6a567d342f3f151836
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-7.15.0.ebuild b/dev-python/ipython/ipython-7.15.0.ebuild
new file mode 100644
index 000000000000..72cb41ac0a13
--- /dev/null
+++ b/dev-python/ipython/ipython-7.15.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils 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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pexpect[${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}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${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}]
+	)"
+
+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
+
+	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_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+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/ipython/ipython-7.5.0.ebuild b/dev-python/ipython/ipython-7.5.0.ebuild
index 059dbdbae848..202f47a34fd9 100644
--- a/dev-python/ipython/ipython-7.5.0.ebuild
+++ b/dev-python/ipython/ipython-7.5.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='readline,sqlite,threads(+)'
 inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index 14180b863741..a898abee9762 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,4 +1,4 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0-r1.ebuild 638 BLAKE2B e3288184a0feffe8f7000b702b369ef1a685a474350ec16af13e03cd8018fa7e5eb6b1ac3ce10101bac678cea486483973c3d2fbeb2dba2b9d122b8507ce5ba3 SHA512 a406b4fda4ba758f3a336fc87685c56a43a77d0e82b33c159a28994e2dc37008aed6337aa07eb12e81fd072899fb1014897548748e41489286ba75da278d1c98
+EBUILD ipython_genutils-0.2.0-r1.ebuild 423 BLAKE2B d1ba402f93c7cd54c8366bcdfc8da82914c93ec85716045a52ec8cf9c53e4521a4ef30b8b80ab59cf818dc4af841f8789ee65c7f228f7241e21336512c1eaf2e SHA512 8856839ec7522824452d315767e5c34754a81c704078a16e24da8893289d1506bdc25581d8e6e0d044b235ff7737fa0cbda27262b918af469db9ebf4f1a28ca5
 EBUILD ipython_genutils-0.2.0.ebuild 633 BLAKE2B 487a65dd1025cb6e3672257b7d03d9606f8fe42aaf2366f3262e9db8f95092e0ea1c632a7a51a9a7ee6d7e3f455c197a8d68f9046ba0b5246813b423bc245e93 SHA512 2c1cf901f04ec51b506a942c2c85075f1c0bc352e87d7317a0af3abb294e54971fddfc49d171fdcb916a1a5b1c2d90e6ead17d22d00f7de8c09414fb1480b05c
-MISC metadata.xml 729 BLAKE2B 91bb45e44e2ccd4686308049920a2a9bc9a0334af7b2cec5365c35d3462782c9f1c95b5496d364ac1b92bf1514102b4e5d6755ff8beabdf5887f0262cdbca889 SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe
+MISC metadata.xml 836 BLAKE2B 4dea2105ba7319f4068c670e25ff874be86c94dd128997eb53e3909a4c20b741ad145b823bc6f5d543554fa69d386717d90dce7c5a5c4644daefb99cc615d95f SHA512 1508f1c25aedcd8128cb5caeca6aa1b344084fa635a3f1634a73eb7bddeb900ee6d6462650d954510f5d0ce23128b1473932fd487791cb68c33504b507dd78c1
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
index 9036c7d809cd..bdcb7286b82d 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,16 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	nosetests --with-coverage --cover-package=ipython_genutils ipython_genutils || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/ipython_genutils/metadata.xml b/dev-python/ipython_genutils/metadata.xml
index c9deb0b0985a..6f8e61b033cd 100644
--- a/dev-python/ipython_genutils/metadata.xml
+++ b/dev-python/ipython_genutils/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     This package contains some common utilities shared by Jupyter and
     IPython projects during The Big Split. As soon as possible, those
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index eb0ba5e3c040..9c2542254591 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,5 +1,7 @@
 DIST ipywidgets-7.0.0.tar.gz 1006851 BLAKE2B 2ee86d0459b6c88b351994dcb4385d31378235a0be157387d90a476e49958bde25df941aa92068266df377c75dac13925d15ba2f8da0987d70adca3e726fa1a7 SHA512 39219478c12f26a2bab0e975b6fb53a7f9ee92b10fa05bd885b21c7c981a4402ad65f497223a4a2c30a7d6d18bb56bec715a20659926075f2e3730e72022ade6
 DIST ipywidgets-7.4.2.tar.gz 4114472 BLAKE2B 45f946da974c1f7c5422248bd5f2eacb92a6791f089d13fb17e025b94058d97210561a6291a6c5b8c7e8e484e7128f5315db2af6cf212762f36e6d884929686f SHA512 ae5ef0615a9771cd83ca17a2a364bd5d6ee0d934d82adf2c70fde84b7c9b000d7bb32595977a607b5439423e0553c9bb8293617b43d0cf322f6bcf4b3b912eec
+DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
 EBUILD ipywidgets-7.0.0.ebuild 862 BLAKE2B 16169cba0069af68b7dafed7b65a59c952d6797cbf8585f31e53708164a54f35a63b253d6909c3614384614447efd48f61891944a866e3a7345116f26f7df3de SHA512 02684dea29156423660f9f71884ba81ad0205901f05ad792f3cbe65e17c6a0ceaaea8a7ee689613ea55898e468669a3b9a53f655f94ae4bf1f68097c77b6c70d
 EBUILD ipywidgets-7.4.2-r1.ebuild 781 BLAKE2B 71d7ce23fd5f1807faae85d54def0a2cfb045caa75bebf59cf6ed5c2758160908d82c73e8f669d7d00245536a69e584259f4de4d8c671a8d6a2911efcf3b396b SHA512 20b13a958d1e5ecabb77874dd410ee3033ec30fce1b1ec79c3c53b023e9796dbff151471f90ab25bd8a79ecda6cff9057a925b5315325e1073791fe99a0eb016
+EBUILD ipywidgets-7.5.1.ebuild 664 BLAKE2B 7af4580bb1b1d9ac9e850f514ca1a92cebc730cca6218e229d2342c4f1df81a6e9196bcf0a90a450048e904bb1a99d0c6bd08a40899a7cdccd758db3eb446e73 SHA512 1566a01de8959635ca069717af459715c29933d7d97fd586f85f5aa72050c7ce6081382ca1665471eaa522707b3efd05abceda1cba74476c2e2c37bb733f72a5
 MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
new file mode 100644
index 000000000000..392387529694
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index f5091e5c845c..fc0a5029fe28 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -2,5 +2,5 @@ AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e7
 DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
 EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
-EBUILD isort-4.3.21_p2-r1.ebuild 823 BLAKE2B c94e032a216f76ffaca474dd7043d0c192a4860083094369963b24beefd17b0eb79cafb0ff422de2372c9b0ab30debb8f749265f03c7bf5827213737b0730f67 SHA512 c40b04b76c51c27545ffb95206cecf8d9043954106db8ae07262528c7ac88e88c5c9cdce01402b2889de84a7d4f321bd8773a2d0055cb6f002884b191e9c3dcb
+EBUILD isort-4.3.21_p2-r1.ebuild 825 BLAKE2B b28c5204dc8ebe6cc11e0964634510dbac30ea67f07f8a2a0db2b17041c8beb4074759aef97ded5f89a536750e968910014b3952d3484a0e22e03ecdaa35a813 SHA512 1ffa30f9ec836fa0d7d0cadfa079f1e8a4a47c23b7839f906fd2f62c438fc63a42392525ba0f42587f14bca1bf886c326d797feabdb54b283951bd9e0a5c7359
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index f594a4b87878..80c482134f45 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-python/pipfile[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index c7c497ebe519..b2f1ce9109e8 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -2,4 +2,4 @@ DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
 EBUILD jaraco-classes-2.0-r1.ebuild 1653 BLAKE2B 0debe2ad86864beccbb67d70d725a8ab4b228006cc7f63fce7981c69cc0a8ce0661c3b5bc79996f0bcb79d1e1539a393fe2847e2b97d5de0ca49dfa149c40090 SHA512 54fbd8c51e0471920e04dc42f6634bf84719a879417cb577d4634b1cb851dc5479b2a8f93f54b0ee7ff6e4b7a2a54cb0340cac4ba16f29e6aedcdf5839b35306
 EBUILD jaraco-classes-3.1.0.ebuild 1653 BLAKE2B 3792df63a58581cee829720d04effab64bef7105ec8b5f719aa467a8816e9b0a6ac242982fa95d30060de6af65a47bf121b4c4802d5104a58bcf51aa1b5e99d8 SHA512 ce9e7850fd67b776e3fb14e3d3491260fd65ec7302437b599879edaf0433f949d537e47dd459f9cf7a54e9456c2e77f0af3551f3bca8deaa83f46578bbe585c8
-MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
+MISC metadata.xml 553 BLAKE2B f5e492cbcab83e5783cb3be7f42c48654f7dd4ae620d92029d7e51c653a1c78b7488bfb6ffaa03a08fa3aa0e99b1b2384cd15de6846ea16ff4f89d948cef5900 SHA512 03759959ae7a56bcfb92581e9586cdc5afe0a5347009a74aa4394d4f65c9b929b15572f7faa02914d376443204b693544fde85e61558688c547a58652e4d2800
diff --git a/dev-python/jaraco-classes/metadata.xml b/dev-python/jaraco-classes/metadata.xml
index 58c7478db6b1..5340d0fdb989 100644
--- a/dev-python/jaraco-classes/metadata.xml
+++ b/dev-python/jaraco-classes/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jaraco.classes</remote-id>
 		<remote-id type="github">jaraco/jaraco.classes</remote-id>
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 7f3952eb5be5..22f35fbf37a1 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -4,5 +4,5 @@ DIST jaraco.collections-2.1.tar.gz 16026 BLAKE2B b79b57b6bac1e18b6be44ea0e5ad65e
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
 EBUILD jaraco-collections-1.5.3-r1.ebuild 1443 BLAKE2B a66ba6c46757c6f82a505bb3a878c628b9457f71060e82ad33fe1a29582ca5527ee915198641efce0333b099a6e27e50cee6b4aaad524652246e932c0a9992c2 SHA512 4923dc53f863e7ef112125a4ab233f858492618a3ad04a9754acec15e12f691337e429570c9ded5677553fa0eaf35ea8ccfe25d2549004e4d25ec2e8fbe5a247
 EBUILD jaraco-collections-2.1.ebuild 1605 BLAKE2B 71bcc1d73d2c0f0dc841f91af5e7f7eb52f4eee14c00ae3e4fb5fbba779f32e3fb7308e70d2633c179654e07281c0fcdeb883f853a994a6ab6d96ad20aa78d10 SHA512 727b8aecdde34c9ccbb6835d21c2e8df8824de36ce358cd5cedc914b4805f3f14eb2c1dc5aca1b7c741ca8abe53a578a733ae788dc016c16e24ae5d4516050f4
-EBUILD jaraco-collections-3.0.0.ebuild 1606 BLAKE2B 8a1642a63f94949a893f545f7bb6090abfbcd076f7fc77c23964607492d4fa1e26e4aba450691648273a38ebb346b1eaff3e4b20f69d699da823626145231152 SHA512 974f9ff56ee43a01ea22991cf27bf8fa601120c42048b59feae4780ff5928bc68e2d59975590a294b9eb93c69c2fc13adb54d59f621f7686aade898c44393fa5
+EBUILD jaraco-collections-3.0.0.ebuild 1622 BLAKE2B 53335e56667657a14c2f710d43b2fb8aa9e78e26c328cee8c7519991fbf53c112310426ecb5ce2735a28f661a2091f57cc6610d8d7bb4f3e33837120fd95be34 SHA512 1800f5dacff1ceb6be9702834ccc10030498069e2568fe9df3ccb6662136fc44b14e2ccf1e6b89c91268c354210b45283b824dff12b76ac9dc6c16e3aeca2ad2
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index daa1b6719567..daf0e55cc4e1 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 6920254f7d57..abfad83b7e30 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
-EBUILD jaraco-envs-1.0.1.ebuild 1221 BLAKE2B 015713b033bdae73a9dea9b427136846855b5b239ea321936a9e2ac355fadf0d5d40e09d21c6b40dfd36997192c670787c58d7c39c78a6ffc25c4f5c0a7aa1e2 SHA512 2cd85cc698f8eef5511e4005f2c97b3e3f4bff58be6d2f48d9c0d1c5f6eb757c08f6d5143cdb5a3882ca0a803ff1e6a02b22c8c2d44d33b284f74f14371cba1b
-EBUILD jaraco-envs-2.0.0.ebuild 943 BLAKE2B 870d811d97661127cb47aa42db13a27e03e00a423d57c7b9dd793f3b99ad0efac8bdbe81ac1faaa870b7efa4be5fb9380db4251642bec247f2cbb2e0e58228c2 SHA512 6d4d72f0dd96d386ec0749642b7a513a85beddceadc28443dcd51c1d3d37ade1fc7dea25306e1f76688b88f70a7f4daa356d72f876e2bfcd9cc13d7cc4632821
+EBUILD jaraco-envs-1.0.1.ebuild 1226 BLAKE2B aa448531f05a3d5c6da92657403e47d36d3419eb78abf6e96c81ad46ebfd02eb59da86f48865888fa2fcd9cd9ac89957a8fe4d017ed65138c23953d384c553ee SHA512 8e23179efa415d71c77c746b597bb3cf6fb52a1fcd0b9cdcc53183c60313befa3713ff745cc12179604b05c9ce6e89c04dd1af0c8430b7688a64182a517c0396
+EBUILD jaraco-envs-2.0.0.ebuild 1038 BLAKE2B 57402728d5175ab58140341521a7a37a0003129295bcca9a108f8b6d6bfc7d4a90a6fc884f1cd31036bcdbbab9a93c0c49b72deab799b7f90fa43d4cdc0f462a SHA512 c93fbd8a2aa0b1443df2b4937b65aa4e03fd72d590d84d08a83a86d519a98d592a62167706bbc492bba7e8ba9f5d213b3e13ce5d4c20a8c8d3c1536bcc4889d4
 MISC metadata.xml 372 BLAKE2B 217b1b3b2a1884ca5bc3c4eea5ce22fb8d529f7b29fbf02870b5c9b88ed0e6aeb5dca1e88997fdda5d00f0bda6aa627f4195d51863dee3c93c93addc0d0025f1 SHA512 693e651230d179571ad77d6ad9fcf48a5b4bd2002b9d3b017ba6999538079ac10ccfd014542713d3ca5c438f127cb1b53d2ad04b1f137b353885e43bd4aea798
diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
index 17dd0999bac8..d93173d1b677 100644
--- a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/jaraco.envs/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
index 3d3446b9761a..9ae4de05313d 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -15,14 +15,16 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
+# toml is required by setuptools_scm
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
 
 # there are no actual tests, just flake8 etc
 RESTRICT="test"
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 71387cbab411..470db73acda9 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,4 +1,3 @@
-AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c3240e3ab74f58dd76f87ea6cbd6a8a5d2b0159579df71001993c36451f79547e674a4d19659646cd86c1181787de0fe5a3b963e646c07c SHA512 6c743bbce1f369e5369ee34a788b7966422e469986e7c5f3d7efbdc1ebafc7487a929fa0a1164aabd3da3a5f9f3c120093cfd978554e8506d05604dec2417bb9
 DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
 EBUILD jaraco-functools-3.0.0.ebuild 1747 BLAKE2B 5bc3c6ec8723e01dff7b9953ce1653a77603e5bf10a913cf526cbe2546f09d05c85809e37254c7a504855c0d85d708b168b58f82710e4f1ce2e219f74ad11883 SHA512 ce4135a8607d136b7866d8c47401ed4c8d2d1c2412b8b3c3ed480963ab03f061a846ddf6bc1f54225c618e0a2594fa17f65e03cecc24eb638a59359db3437a6f
diff --git a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch b/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
deleted file mode 100644
index dc296c4eb47c..000000000000
--- a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cc972095e5aa2ae80d1d69d7ca84ee94178e869a Mon Sep 17 00:00:00 2001
-From: "Jason R. Coombs" <jaraco@jaraco.com>
-Date: Sat, 20 Apr 2019 07:08:41 -0400
-Subject: [PATCH] Rewrite docstring on Python 3.7.3 to allow the test to pass.
- Fixes #12.
-
----
- conftest.py | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
- create mode 100644 conftest.py
-
-diff --git a/conftest.py b/conftest.py
-new file mode 100644
-index 0000000..b6fad41
---- /dev/null
-+++ b/conftest.py
-@@ -0,0 +1,24 @@
-+import sys
-+import re
-+
-+import jaraco.functools
-+
-+
-+def pytest_configure():
-+	patch_for_issue_12()
-+
-+
-+def patch_for_issue_12():
-+	"""
-+	Issue #12 revealed that Python 3.7.3 had a subtle
-+	change in the C implementation of functools that
-+	broke the assumptions around the method_cache (or
-+	any caller using possibly empty keyword arguments).
-+	This patch adjusts the docstring for that test so it
-+	can pass on that Python version.
-+	"""
-+	affected_ver = 3, 7, 3
-+	if sys.version_info[:3] != affected_ver:
-+		return
-+	mc = jaraco.functools.method_cache
-+	mc.__doc__ = re.sub(r'^(\s+)75', r'\g<1>76', mc.__doc__, flags=re.M)
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 477311effb57..dd0aaacaa57d 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
 EBUILD jaraco-text-1.10.1-r1.ebuild 1398 BLAKE2B a8ddc0d90f447a17d0660aa46cf19e57895edcd96678f0d1d664055cf84996a584c7c6bb189cce39aaecc02bb4fdf7000f853a46b119a0976e97aae700f053e5 SHA512 5feda10ad31693621278217fe811596f2b2a6c40c8bd6980cfed04a45fb79cb5ff6dd51fa12bce8e6cef285c176ee4716a114b98335d105bdcb0fb351d574b4a
 EBUILD jaraco-text-3.1.ebuild 1639 BLAKE2B 7ea163dcc304213bf92afde4b9c91eb9bdec7b6fabe41befa86115f82a78d3bf7df299e9e52fc3a0a95d82bfcf066e85d86bbe7da8c8c779456ac62294f8c59b SHA512 b347c1514a3f691d69458d5f97479a132a0f47bded24ab3144df6cec45a3446c41e695637e4d6a378c31928877fd4f3aa325f98c40c9dcca4dfc0d8d6e494b73
-EBUILD jaraco-text-3.2.0.ebuild 1483 BLAKE2B 48d942ddf284587af0732086b8030e1d4c64491ba248d1113dfda3f37e931c8461631f232d36e9202ec363016186d9ce39e54dd1e575f8dd9765983ad6720821 SHA512 b80c5610bd0e53460e38276b21e2021e4c70df94a116dcd56597f461c8085b3e03da53ca80dfdeaca4456e3de61d8a88889cde9e74855874b2bc0e3520dfa926
+EBUILD jaraco-text-3.2.0.ebuild 1499 BLAKE2B d813da4cb3d6ab0b43008af4b545a31e7ec0c06b0fc376ade2e099fb5c7799c93950a66faa1debd46bca16a60fc49ac61537a0e7af0e460ed3daa826347c66a5 SHA512 1b6a457356edb9bedfbf4a006b52513ed768ede02fc9367d67520ae53e61f8cc731dfe80a8e2d13054545d87cb950f1ba4c27590c980dad67dda4c9be9bb8647
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 517e5d272f9d..7787ea07b500 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 4d54e08b7531..8a468a4c6973 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,3 +1,5 @@
+DIST jdcal-1.4.1.tar.gz 7479 BLAKE2B a53954b12c5f1fed81fe6241b5097a7def4074ae83d6e31a528ac0fa87a3d90b504e2fe1a80b44cf19663e1402695460f9e3acb54a2333181f21e7cef47f737d SHA512 5e14f470f35764c0d76fcf0ee13f9ea0879e645b589a48636207b7848f3df0437343898595c8cf19b8e4fe8a172d4e82aa06e56284ed263154c93de217e24e39
 DIST jdcal-1.4.tar.gz 7545 BLAKE2B 20c3e64a0c1a2cb2078c3058b38a7ae7337880703305ff26d4b0990f4efe1532ebbf8dbaf666a656f7d0176011b651d96853db0c0713356f46191c849630a041 SHA512 d49ac3cb4241556900c0a4dcbbea0ba621206cea767e272fb994c7ec76edd6859b184cf17ea5f9a42ab2134a5be13bca4b6d74021d627584576c01f2cded438e
-EBUILD jdcal-1.4.ebuild 587 BLAKE2B 0c19076fdc4120eb13d4196c9bb23bc0595863972768d70579eb2f75e44781c8a4a4d779877f964f316475688fb39300550cacedbfd066aebf672b625c5dae2a SHA512 71a71abe3e378b2bac09e7ba639eb41c67807c6597495b6b3596921619f2606c24178e2aced39774de991a287371a1585425696f0c3c22945afd28791f9bf66c
+EBUILD jdcal-1.4.1.ebuild 447 BLAKE2B a2e092ffa46b207fec6c8db9d443a9909fea1f09b4495eec0f47f1bae29af8624c9e1033875e6195ab1b57426db649a67e760541b0b6bcff4097332e3425d627 SHA512 d9bd440bb45496e2556c083edf24395d469562594278dcba3f1804c0a61e1da08e1fec3954a53c2b012d1f48bc43530fcaa38084dfdb8da34ae7da2c85481ca4
+EBUILD jdcal-1.4.ebuild 445 BLAKE2B 5e45bc8a0e31edd65a846f09311c2a4b31b7e18a5bb7adb41f53a01f0910847bc0e9efe5432ab392d790e35f73316dd882cacf6930ee13fa4780ad87f4310ad5 SHA512 adc621b03122f6fc7d0e755e0653b9f2c11bbc95cfa6fd25fbb114bf6bce55e8f0dd3bc2c1f8f287df7bd9cf68d11cd759e308e9546ee91b41aa61ac2f2832d0
 MISC metadata.xml 369 BLAKE2B f0096e762647b29c559df839d2c8cef8c42c846e8b19ee151efc141d72270cfe31a5e90eb0545f4a9b79582f1169e1f8ec797d918079630ca4424e8d3b6bc113 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f
diff --git a/dev-python/jdcal/jdcal-1.4.1.ebuild b/dev-python/jdcal/jdcal-1.4.1.ebuild
new file mode 100644
index 000000000000..e11a2e8e0fcf
--- /dev/null
+++ b/dev-python/jdcal/jdcal-1.4.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
+HOMEPAGE="https://github.com/phn/jdcal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jdcal/jdcal-1.4.ebuild b/dev-python/jdcal/jdcal-1.4.ebuild
index 70a2b7c71525..60b57f24139b 100644
--- a/dev-python/jdcal/jdcal-1.4.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,12 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -vv || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index c4633c71d86b..7b835144a9f8 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,4 +1,3 @@
-AUX jedi-0.15.1-tests.patch 4110 BLAKE2B 3e99d214fa218bc2488aaad1a9d7bad16f26f0bcea07b96b4d8a5ae162df799a5747987961dac602186507015297183e81efc90bfc1dc6cf27585ab739629fc6 SHA512 394dcee9577a62abdc7a6c074c79fa801b0dbe04796d17333fcafd1344567d3c4f741d202e3d7929f23236f854a888b94679e1d061488967d621a37b1229a188
 AUX jedi-0.17.0-tests.patch 957 BLAKE2B 1ee6b50291131f7acf2a2a35e575c83b22ad08bb38ff7879724f28a4c46290c04b86ef4135ffc8a0363edca0d988fcc58d33faeabbb4a522a33eb3fccb9d4362 SHA512 fe0e4a4cfdecbc029c04e87509ba55c00aabc39f3ed16521d5bc1a5b576c273848a9bc13e9af503d104fa42b6dd45ec533e922c9246eca8c9fee666f290ac9dc
 DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
 DIST jedi-0.15.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e
@@ -7,5 +6,5 @@ DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd3
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
 EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
 EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
-EBUILD jedi-0.17.0.ebuild 2005 BLAKE2B 80a8a63e814a8a4128fb0cdebca8aaf6080fd3abdd84230205005a5028658976eba1e9d0e633254c24f3bbae178e11ef8445f6caa593ef3b0432caef6a327f11 SHA512 c5dd4a269ce360fe780a02d7297faee4e47ddb0a3b32912a6eecce8a80e2ff41b4a5b3c38fd64b3b6caaba8c085e931b0744097181a404e99282389f32b1ab72
+EBUILD jedi-0.17.0.ebuild 2128 BLAKE2B a5e1e2889bce86068fbe7407bed098d32c89ff735ff1498f78692aa430e66a5cd633379dbceb5baaeac3daf9fe0a31330f5b1142402fc1328801be3b5a3ac669 SHA512 6489b4bf7ae68fda13a3062e183a0a3063a1225ba914a8107c4371362fa1ef04b08ae2b967f927a03ac29024b2edc37c9957183dc10fab7c72923af575915b3f
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/files/jedi-0.15.1-tests.patch b/dev-python/jedi/files/jedi-0.15.1-tests.patch
deleted file mode 100644
index cdc59053df03..000000000000
--- a/dev-python/jedi/files/jedi-0.15.1-tests.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/test/test_api/test_completion.py b/test/test_api/test_completion.py
-index 178daee9..0c86f837 100644
---- a/test/test_api/test_completion.py
-+++ b/test/test_api/test_completion.py
-@@ -1,4 +1,5 @@
--from os.path import join, sep as s
-+from os.path import join, sep as s, dirname
-+import os
- import sys
- from textwrap import dedent
- 
-@@ -164,6 +165,7 @@ f2 = join(root_dir, 'test', 'example.py')
- os_path = 'from os.path import *\n'
- # os.path.sep escaped
- se = s * 2 if s == '\\' else s
-+current_dirname = os.path.basename(dirname(dirname(dirname(__file__))))
- 
- 
- @pytest.mark.parametrize(
-@@ -181,7 +183,7 @@ se = s * 2 if s == '\\' else s
-         ('test%sexample.py' % se, 'r"test%scomp"' % s, 5, ['t' + s]),
-         ('test%sexample.py' % se, 'r"test%scomp"' % s, 11, ['letion' + s]),
-         ('test%sexample.py' % se, '"%s"' % join('test', 'completion', 'basi'), 21, ['c.py']),
--        ('example.py', 'rb"' + join('..', 'jedi', 'tes'), None, ['t' + s]),
-+        ('example.py', 'rb"'+ join('..', current_dirname, 'tes'), None, ['t' + s]),
- 
-         # Absolute paths
-         (None, '"' + join(root_dir, 'test', 'test_ca'), None, ['che.py"']),
-diff --git a/test/test_evaluate/test_signature.py b/test/test_evaluate/test_signature.py
-index 0bb5cbae..2fda3d55 100644
---- a/test/test_evaluate/test_signature.py
-+++ b/test/test_evaluate/test_signature.py
-@@ -16,7 +16,7 @@ from jedi.evaluate.gradual.conversion import _stub_to_python_context_set
-         ('str', "str(object='', /) -> str", ['object'], ge, (2, 7)),
- 
-         ('pow', 'pow(x, y, z=None, /) -> number', ['x', 'y', 'z'], lt, (3, 5)),
--        ('pow', 'pow(x, y, z=None, /)', ['x', 'y', 'z'], ge, (3, 5)),
-+        ('pow', 'pow(base, exp, mod=None)', ['base', 'exp', 'mod'], ge, (3, 8)),
- 
-         ('bytes.partition', 'partition(self, sep, /) -> (head, sep, tail)', ['self', 'sep'], lt, (3, 5)),
-         ('bytes.partition', 'partition(self, sep, /)', ['self', 'sep'], ge, (3, 5)),
-diff --git a/test/test_evaluate/test_sys_path.py b/test/test_evaluate/test_sys_path.py
-index deaa64ca..fdee2ece 100644
---- a/test/test_evaluate/test_sys_path.py
-+++ b/test/test_evaluate/test_sys_path.py
-@@ -1,7 +1,9 @@
- import os
-+import os.path
- from glob import glob
- import sys
- import shutil
-+import distutils.sysconfig
- 
- import pytest
- from ..helpers import skip_if_windows, skip_if_not_windows
-@@ -33,12 +35,10 @@ def test_venv_and_pths(venv_path):
-     pjoin = os.path.join
- 
-     CUR_DIR = os.path.dirname(__file__)
--    site_pkg_path = pjoin(venv_path, 'lib')
--    if os.name == 'nt':
--        site_pkg_path = pjoin(site_pkg_path, 'site-packages')
--    else:
--        site_pkg_path = glob(pjoin(site_pkg_path, 'python*', 'site-packages'))[0]
--    shutil.rmtree(site_pkg_path)
-+    site_pkg_path = pjoin(venv_path,
-+                          distutils.sysconfig.get_python_lib().lstrip(distutils.sysconfig.BASE_PREFIX))
-+    if os.path.exists(site_pkg_path):
-+        shutil.rmtree(site_pkg_path)
-     shutil.copytree(pjoin(CUR_DIR, 'sample_venvs', 'pth_directory'), site_pkg_path)
- 
-     virtualenv = create_environment(venv_path)
-diff --git a/test/test_utils.py b/test/test_utils.py
-index 17328a36..71217086 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -77,10 +77,14 @@ class TestSetupReadline(unittest.TestCase):
-         # There are minor differences, e.g. the dir doesn't include deleted
-         # items as well as items that are not only available on linux.
-         difference = set(self.completions(s)).symmetric_difference(goal)
--        difference = {x for x in difference if not x.startswith('from os import _')}
-+        difference = {
-+            x for x in difference
-+            if all(not x.startswith('from os import ' + s)
-+                   for s in ['_', 'O_', 'EX_', 'MFD_', 'SF_'])
-+        }
-         # There are quite a few differences, because both Windows and Linux
--        # (posix and nt) libraries are included.
--        assert len(difference) < 38
-+        # (posix and nt) librariesare included.
-+        assert len(difference) < 22
- 
-     @cwd_at('test')
-     def test_local_import(self):
diff --git a/dev-python/jedi/jedi-0.17.0.ebuild b/dev-python/jedi/jedi-0.17.0.ebuild
index ec64254f90cb..e8e830ee68ec 100644
--- a/dev-python/jedi/jedi-0.17.0.ebuild
+++ b/dev-python/jedi/jedi-0.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -25,7 +25,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -54,9 +55,12 @@ python_prepare_all() {
 	sed -e '/with sqlite3\.connect/,+2d' \
 		-i test/completion/stdlib.py || die
 
-	# really silly assumptions, not fit for py3.8
-	sed -e '/len(difference)/s:20:22:' \
+	# really silly assumptions, not fit for py3.8/3.9
+	sed -e '/len(difference)/s:20:27:' \
 		-i test/test_utils.py || die
+	# py3.9
+	sed -e 's:test_infer_on_generator:_&:' \
+		-i test/test_api/test_api.py || die
 
 	# tests relying on pristine virtualenv
 	# this relies on test* not matching anything else
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 69bd619a2ca1..420ef53568fc 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
-EBUILD jeepney-0.4.3.ebuild 790 BLAKE2B 68c5623c5453fb466850ab36055d82f95a0435f69f1619445b4b8b0c6d4c8bde595e761cc9d94ead87ffb73ba95864c327ab42d626a8120dd19bd2f0cec68136 SHA512 ef870b78a967b7b216afe8401fc452ea10218da228f55185c4e9a9abce936da8680c510c96b051634e1a68c6e66890aa26f3fe82c006211771d9046902b16c14
+EBUILD jeepney-0.4.3.ebuild 808 BLAKE2B da107263e69eb97bccc2bdbd59e08d453ef30618beff9a6c0c57820c1980bfb36adc50be6840e3241f30f4934a74947ec4b8ac689b638cd7834808df84a84be2 SHA512 5dea8ffc3ef6ef42824a65b8cccb9d872f9aa1358205272b6388e9acd9ff969af6ad3d0e3d5eda0a9cc06ee6005c95f5df63fee21305a12b1f4a6acac63669dc
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
index 56491b219744..48253ebcd3af 100644
--- a/dev-python/jeepney/jeepney-0.4.3.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.3.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 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index b8ec9c5958bf..b363c704b00c 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,3 +1,5 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
-EBUILD jmespath-0.9.3-r1.ebuild 613 BLAKE2B 6c7ff096f1a04cbbb769813a78685195d98d03d3b66b0765514224290b4c0949d06fdc46578e86efe86e7631845ff8bd916a9faaa1e99bf924aa2537e1a81565 SHA512 f08868716741ccef0e9fdf3842145415e9ad8f92f64f36fd0477b94555011ce987fbf45c59614317161f159346b6c473591bd6096a310a5613e3a3c8ab92f882
-MISC metadata.xml 570 BLAKE2B a6d5d0e838a59de2031b7df52ac683dbc5a7d692ed96a6334bafc5e76d0018f32990913a49539e7d093f195f548ef4ab55e8cdc93c1fa1779d87140336e40a8e SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b
+DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
+EBUILD jmespath-0.10.0.ebuild 551 BLAKE2B a74908dc340bf62802dac406f4425aeee1eb2f734dc1cd26ac0d710e188260064bb7851a78c61235fc0db8fa0c2360ce14bee6bf6db04fd1e333929b511d8924 SHA512 63586d43d21aa3773307ce5527e04b3ce5de59f4d902ff9c9b524ed9242cd8db56565b19b688a4d5009dc781569dad8d9e5ef7b79a2b3e098684bf36820338c5
+EBUILD jmespath-0.9.3-r1.ebuild 452 BLAKE2B d9eb98e3e95a8e35ab0b509b4314fbe990a4b3f1a29c7b44ea5cf52e97ff4134ab84270af217879832217aa722f3cebc079dc7b80d02f6eb06ed86e5fa88741f SHA512 63aa48182ea8291df018efe1aa924b5ac1e21ba943f36cf1e3c13040c731301fdb99b44c85d8d6aa1de0282c53df7df6af333f27d59edb18aa39ee2f6ed5aa09
+MISC metadata.xml 376 BLAKE2B 811964987587bd0b44eda8dcb820389aa6488ef5cbfc5631440c8aafff66ce63d86149caa1962debac6708473a69e125e0b6532f39d47d16670c6d7cee4161fa SHA512 1a27c30842b92e305524814d2e6c3904d469a63c2343a958c16201dfc4e94a2d9502e678280f228445a657a7e07047a5b5e163893358dee40288fbb33aea4d3b
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
new file mode 100644
index 000000000000..c0b40b306c50
--- /dev/null
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=jmespath.py-${PV}
+DESCRIPTION="JSON Matching Expressions"
+HOMEPAGE="https://github.com/jmespath/jmespath.py/
+	https://pypi.org/project/jmespath/"
+SRC_URI="
+	https://github.com/jmespath/jmespath.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests nose
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
index ca2bac2dfae1..750aa2040e94 100644
--- a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,15 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	nosetests || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/jmespath/metadata.xml b/dev-python/jmespath/metadata.xml
index 1f180a1cf789..500ee1453701 100644
--- a/dev-python/jmespath/metadata.xml
+++ b/dev-python/jmespath/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 0365ad61f550..e00683eefecc 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,3 @@
 DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
-EBUILD joblib-0.14.1.ebuild 1141 BLAKE2B 73f3223e49c6db50cbc5f0f4136e37ff0a005c6592e50b5d75134275826e8816f44054187f8c9c9f0fabc98d473e187bea44ebc69cf171f5541f0764b7696203 SHA512 d3e5b12a3b13189a378dd4fdad906e1c777402281ffbb526bd04ba3d5962923a30f3a5d65137b03b1a829ad0636d77a1b6c80134d32d0e754ee7c6723100b4d6
+EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.14.1.ebuild b/dev-python/joblib/joblib-0.14.1.ebuild
index bca16a0ef343..da3e493721db 100644
--- a/dev-python/joblib/joblib-0.14.1.ebuild
+++ b/dev-python/joblib/joblib-0.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 273eb5b1856a..1284d2a57bf8 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,5 +1,5 @@
 DIST jsondiff-1.1.2.tar.gz 7803 BLAKE2B cbfcfdb2c6c3bb721b4db43aca1d66649257db2cd9feb9655015e621fcd90c72af087696b9553a10ac89cdaf5f23d8748463e1a13bdb19207e34e12e66629544 SHA512 ca96bb80a6f7a34c8c5bcde74856dc1c4935b3e2979330ecfc33432aff83968e671b2aaf310c77f2c7d431be1ae6e20a960879700ba3c903a09a48b23d4c0288
 DIST jsondiff-1.2.0.tar.gz 15076 BLAKE2B 2d659598e6c647c8ea6622fc982808381e570c6ced23b5e77431b52e9fa746a5dbc743c739506362497d1f45dd2c290f23f459713ef31e927c05816e56659762 SHA512 5aa391ccc42d07330dfcf272b78aeb130f6f9033ca8b00cbea93549e32f07b98ea84cd6a1e61ab331da3de92838c69a501f95a9adb5f48e2eec46eb653264d55
 EBUILD jsondiff-1.1.2.ebuild 836 BLAKE2B 4f6fbd241419838ac7fe9060bbb12599773409954b69b9d2c7720684638fdc01c4505301ac73eedbfcedbbc81c840b761c29c3f26c4906699e45729a36d0f580 SHA512 9342596313ffe7ad344460438a740402239c167e8b021eed6a80ab035a37ea4910da1ecc56e5f8f206349b3c08ebb1e07260cdb20636fcf6461a595658b1446f
-EBUILD jsondiff-1.2.0.ebuild 762 BLAKE2B bf333f1820ea0d60156ffc6e243a48c04a2428676f16c01210c3d6b087a2d1583c6bf8a08d18a316ccc14c655091b9f5a72d773aefd33588f7ce975bdc71767d SHA512 84d34aeebb50154de3f66faafb743023f38642d44b7809340665873daf7ecc8c024026b564095c39304d93e600066c01f2fd7858ff368c67b367018bb7b505c1
+EBUILD jsondiff-1.2.0.ebuild 761 BLAKE2B 372d5450d0485ca25caab2f0b2d55dd14f4ed8da10c610eaaa6aa17e53039ae8a3ad28f1ff2b9701d61f54db34e58b07ece61df89666db113caa19c7fb7824d6 SHA512 91e3ad1072edd8114ba7706658468b4affa15fb59848ceebd6fd4d10d176a8dce7128a1370f3c8cda0277041443d6b839996010ba51604409059c6585e343398
 MISC metadata.xml 435 BLAKE2B 3ea5af8e9063a07c6d3d93225a712395a351a368bf689e512b45e6225e23a543771839e756ee53cf51142b6309f0b1ecd20fff6203a69ae754c44893d09c5274 SHA512 d1b50f01a0a5f2381fe41e4da073fd00afd4443a76d692c7a2227e50b178e9b990c4c40b72d1beeeab7cc8e5f1a9a52beb758a5adbd088eb787b9f2d08844eff
diff --git a/dev-python/jsondiff/jsondiff-1.2.0.ebuild b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
index 29227333f395..83f6954f2d86 100644
--- a/dev-python/jsondiff/jsondiff-1.2.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 41def7a44232..3f6aa7f2709d 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpickle-1.3.tar.gz 76571 BLAKE2B 797ac90d1aacb620d9917bd2a34dbc960739b29f64d7bc003c934333fc0d836657a4907a965725248b2f9489876ae251440eab3888112f158c28f19e33efe036 SHA512 5e7faa32f4fd2da88d9cfea8c0355121ece12aa1b4434845e6bd679718f433e5c27835b405f833a31d69d09d7a6ae6c3d5e4bf1f6dc9c50c7ff1690cf82271b0
 DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
 EBUILD jsonpickle-1.3.ebuild 1464 BLAKE2B c296889e4932cb48a7e07ceb4480280c5f751eac869c0d70923a79758ca407fa0e2432212d269e692164a981c2745e40b097d32fb7042b9d86ec9f25c018fd66 SHA512 5bd82786b9e4260caa244bf9280300069b569eea5765eae0c9a381d3c804da2d4a882cc726a163f97bd8ff205e446f115e5bab896917aefb1c25e63f1a6788f2
-EBUILD jsonpickle-1.4.1-r1.ebuild 1293 BLAKE2B 5444f6debbee382575a279877368060b77e05130ba966947f0d2049fe26cb02aaac0918ac79911921f86cd67a03782785147c444f80d8dee43eebdb749367c6a SHA512 9e5b96a83f473ace7989f5b76117830f1e65b70d40222c3daf97c2fd10bc01b674061317108fb20d6d2dabbe7ea7f790f1e110c1df4c42279688fe9800466754
+EBUILD jsonpickle-1.4.1-r1.ebuild 1290 BLAKE2B 40850b13753a047e8bfa80939df7733a863c0aaca17efb6c92f7e6449c010448bb12fe8e60e7d09d3df5b48e34f9e9587d010e0f4557bb63b53a500d79bbc6eb SHA512 9545f7bffd34dd158721c952619a406179156f9a354268efd44b71fcd468f91e301705d2806cba70ff85e63369f5dc733198a632b5ff06b91d1da9d5820e2ab4
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
index f62eec6bfb7e..fa56bf7fde12 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 795cf16f77a1..83f572b31b4e 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,4 +1,4 @@
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-2.0-r1.ebuild 663 BLAKE2B 7dc8a6098918babdded8b9355eae60543fc9b850c47617cedebdbf5706e61cf67c738923860983d2eedabdbb5853c4f5cd579eb0de0aac50218b7b266365232d SHA512 822c1b35d7a54bb8bbbbcdfc8834393bf8ef0713a5f9c35ec6d30f08a0369def161d6899ffaf09ff2271591b64adf04438342f05ddea7b583024f50eb4a3dd84
+EBUILD jsonpointer-2.0-r1.ebuild 604 BLAKE2B f3e7d7b4e1e6f2841b71a83a51dd4a56004af50393e0d0eda4f9d1b86f7f0fdc5567df6b240457a3044a465e4833a259117080f6b1ce26decabddf03d4a04915 SHA512 d10e60313026be6fb1d2b5d32a6b82dfefc305574c5eea0e8dcfc4d0561465814243f4c54b20de400197dfca917dc6546260368b47767230ee8994b7685c70e4
 EBUILD jsonpointer-2.0.ebuild 625 BLAKE2B d411c533826cc23808cbdfacb38ffe6d93bd63c663abf1bdcbf6ae12d36e8e2e2708c2cc64db493faf2f1ab279e224df31a4e7349ad60e84dc8828119927ed3d SHA512 3c21bb33e6bba667dfb62ecce849781b869c1bbd39071564df3f5e6b8c7491662d3dbb62de22673848aaa9aca8b9f937201732fe0f1c9fe5d4df3e14f26eda35
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 2f61b34edb5e..5250c3905761 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 
 inherit distutils-r1
 
@@ -12,9 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 9a1f41338058..123236004014 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -4,5 +4,5 @@ DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf9
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 EBUILD jsonschema-2.6.0.ebuild 1037 BLAKE2B 53228667cdf093e796aa33d9a75051ff6f8d55a7777746227ae821af820f7ba782db4852d92369e5160c598ce1442fc8f693b1183802ba2f72724c0f0347578a SHA512 71e29830554566c8bc27c2d0d7a1d90a91006e91c6c930708f23a393f25a801bf4f56ad68d0b0d7f6319ce4dad4020e2bd7c784c1dee1fc6b1d235146a4a171b
 EBUILD jsonschema-3.0.1.ebuild 1216 BLAKE2B 8dbbb190ea4fa4e8b4717a85ea912e1c5b9ef318143c7a5093e3f39f312939fe4034ceaa9694fc481619b1ec1a15f926bceb9a46924fe55ad821f20ead6e1741 SHA512 ee670550b321627adf4db6ad3b8a55a2aa006b4709aa466d20630509349a5013ddd8d81798c7065ad6b2078cfd30d79656846d66e871b0e980ac84abf4770ee6
-EBUILD jsonschema-3.2.0.ebuild 1661 BLAKE2B 281c3bfb04652dd48a750982e55d4a583fbcddd3a172fbdac820c6cab3d5d89d514c1aad817b88c9e5420913849836a91fa23d37bab9edf6a93b0a1ae2cab368 SHA512 45512ebff5e485da5965cb1630eaa22c011ed0dde627cd7c00fb35759c095bdb803903c9437c3b563d8ff35efbddb66c63a8119499ec8ee8493d8766afc3030e
+EBUILD jsonschema-3.2.0.ebuild 1652 BLAKE2B 6e365a1189818589cba9ceb79188f4289c46760ffd86bdf57151098691defd2ecc1451efda09813a2efabab7bb9a34f4fc8b6bbe1cdb6444a931082bdcfd5b00 SHA512 6416cd44bf96c4a6f8cf3fe29d88035922bdd9bc1fc24de48e6d082beb30dd0a236357d4e834157da4a170685782a6c2309ca9aabfc4918858ed23da8731f07f
 MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 8006d3a74e8e..641d5dd31c29 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} )
 
 inherit distutils-r1
 
@@ -13,7 +13,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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 1eb7fb71013b..98a0dd40092d 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,5 +1,7 @@
 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
 DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf
+DIST jupyter_client-6.1.3.tar.gz 290112 BLAKE2B 205d4fc4bee263b05a36c562db11fe9a0d39defa5d633e85412a7e6382ddc49f9875c5112c1d23108b8e8ae7e57060afebeef949d7bf685b9541dfd06ae43fcd SHA512 39756e1bd7a051092c70c5f75ff1a8b8dd308eb054b3e572d5682e832dc83e6935c3f845230908f1c3debe95977c7b7ae63c373aad4ea6c1e87674b083d5e72c
 EBUILD jupyter_client-5.2.3-r1.ebuild 832 BLAKE2B 1dc7d8971a00f3e0bd8aad14f7ffedab3d79a4a0b5f8132109f09a9c2d6704160302db777d7455643004337a886482175245e6ecac6876250a5260a1e8ee18fe SHA512 071de2eb4f843e0b0dd038d8de712b249d74d7ae15655b96e63b7c62f6e4df6ec89bddadb8d695e97644d64a06d21f4707e3285e52d5b8c865b23306413a4ffe
 EBUILD jupyter_client-5.3.4.ebuild 903 BLAKE2B ecd0184c24dc7820d44ce8f50e124fb3fc1f8ae1c494b2b7e6fd76f81f0eeac3815515be73285d8368feef61ff27ab553b569ab3100cd3fefda771a7ad5e33a0 SHA512 0110cfbd150b7be4b625a7d572a0aed9f4f9ecc88f2680a4b338813e5faaa21f7c8f0be92f770a311b73e2c28aa856ed2b2ba9c3d61e04fb9aa366649ebb676c
-MISC metadata.xml 672 BLAKE2B e96cde9c6b809967ba7b2331651ef50667117d6460e468276727c2cd6d93eaec478f16567a0e1b2997f28c3839cf3bb8217866147e71f3803886bf7571a7b167 SHA512 6dc6d4c32e72e299a6d58b28454bd8de1bb102eb8f0f2c2556edc861df9c4f0375890b69688ff46eafa97577cad38416fff39b2effb824f528fda5e9c0e3511a
+EBUILD jupyter_client-6.1.3.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
+MISC metadata.xml 779 BLAKE2B 43107b0b7e5e1316a386e41e99c482dd13eb753bcaeebf6b496d7b432b69aaee01f6777877033154b178b17bbef87cb019d4fc55302e089c69972ec7dd412c59 SHA512 4333a7a7ae831d4f12b09d3f78fea784c508ed1de502b71d5279c6574cec7808e0e13e0e9b59d3b6048788d406f617a883f753204eaa22c24218587e3e4fd610
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.3.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.3.ebuild
new file mode 100644
index 000000000000..2bf01c589f1a
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-6.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
index b7b61012ccff..f213c00ae88b 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter_client/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     Contains the reference implementation of the Jupyter protocol. It
     also provides client and kernel management APIs for working with
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 0929e886fc9a..8ab70ce8dfdd 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,3 +1,6 @@
+AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
 DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f
+DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
 EBUILD jupyter_console-6.0.0.ebuild 1200 BLAKE2B 5a3c2949ae83be132e54670b8548bfe8ceccd69d73dc49d8d36ba1fe1044688670c92e34194d0b820ba96cd9077af56436096d2e5094d824826da2005c52ad00 SHA512 7825f0efa66645400f3ef3b1fc0164137dbe13734b0fded0d387e12def1e1922232b8cfe9eed370e1386557c21b15b1f7145beda0aeabc5a53940774be551f03
-MISC metadata.xml 569 BLAKE2B 2f205ddc11fc56ac1b708a0d4e786d1e04051faa47af17970d4ed0a2088c4159a1b3199f2581794884463a83fc33926a053c55b4e6b265bdd90539a6d700d977 SHA512 dd29f7ff9dcca2afaa4caf814f4792391560a33b485d9a6de539a36c75df7b63e59d3eabf7bcb020b48ad30a7de0ac28137f54d96023fbc435e3a6378cc79b10
+EBUILD jupyter_console-6.1.0.ebuild 869 BLAKE2B 8ca12ecd563abaa9a011a90c4da3bee86405b85935d202166218599f7581abcc1946fb6304b9214030104638d963fd21dca086cdb72992473a4ce583b31c5f6e SHA512 77ad3b92664e3af1ab3cebbf8aa5cf3ad1f029521c9981e68e6d844b7465864ad2ff8e4c9462a820ee6d8960081cc66132256ab4d44fe39aa3c2e95dee3ef750
+MISC metadata.xml 676 BLAKE2B bf2c14249bcb77defadb810b89cd41359927e79722a4aa3e7f9bb493e2a567d076b7f72922f74a94023e4339e0005d5e28ee3f1599e33962ccb4b0b810f9e4e9 SHA512 fd331bc5e964ed1124d0a927a0d31ad8a22b1ed6e797023a0af1457d037bea96078553c78bdfff84a3512e11a08c5fb91c6287d032e99f3a6da739cf7d0bd04c
diff --git a/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch b/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch
new file mode 100644
index 000000000000..92d3532649e9
--- /dev/null
+++ b/dev-python/jupyter_console/files/jupyter_console-6.1.0-py39.patch
@@ -0,0 +1,51 @@
+From 3b648aab9ce731beab1f02d714a97905ab0e42e1 Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Thu, 2 Jan 2020 18:30:41 +0530
+Subject: [PATCH] Fix deprecation warning in base64
+
+---
+ jupyter_console/ptshell.py                  | 6 +++---
+ jupyter_console/tests/test_image_handler.py | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/jupyter_console/ptshell.py b/jupyter_console/ptshell.py
+index 84af32f..6a55fe1 100644
+--- a/jupyter_console/ptshell.py
++++ b/jupyter_console/ptshell.py
+@@ -818,12 +818,12 @@ def handle_image_PIL(self, data, mime):
+             from PIL import Image, ImageShow
+         except ImportError:
+             return False
+-        raw = base64.decodestring(data[mime].encode('ascii'))
++        raw = base64.decodebytes(data[mime].encode('ascii'))
+         img = Image.open(BytesIO(raw))
+         return ImageShow.show(img)
+ 
+     def handle_image_stream(self, data, mime):
+-        raw = base64.decodestring(data[mime].encode('ascii'))
++        raw = base64.decodebytes(data[mime].encode('ascii'))
+         imageformat = self._imagemime[mime]
+         fmt = dict(format=imageformat)
+         args = [s.format(**fmt) for s in self.stream_image_handler]
+@@ -835,7 +835,7 @@ def handle_image_stream(self, data, mime):
+         return (proc.returncode == 0)
+ 
+     def handle_image_tempfile(self, data, mime):
+-        raw = base64.decodestring(data[mime].encode('ascii'))
++        raw = base64.decodebytes(data[mime].encode('ascii'))
+         imageformat = self._imagemime[mime]
+         filename = 'tmp.{0}'.format(imageformat)
+         with NamedFileInTemporaryDirectory(filename) as f, \
+diff --git a/jupyter_console/tests/test_image_handler.py b/jupyter_console/tests/test_image_handler.py
+index 5296635..b2a5ea9 100644
+--- a/jupyter_console/tests/test_image_handler.py
++++ b/jupyter_console/tests/test_image_handler.py
+@@ -32,7 +32,7 @@ def setUp(self):
+         self.shell = NonCommunicatingShell()
+         self.raw = b'dummy data'
+         self.mime = 'image/png'
+-        self.data = {self.mime: base64.encodestring(self.raw).decode('ascii')}
++        self.data = {self.mime: base64.encodebytes(self.raw).decode('ascii')}
+ 
+     def test_call_pil_by_default(self):
+         pil_called_with = []
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild
new file mode 100644
index 000000000000..37b6ca896bc2
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)
+	"
+
+distutils_enable_sphinx docs
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+python_test() {
+	script -eqc "nosetests -v" || die
+}
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
index 5f427be5461c..2787cd2e4fca 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter_console/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     A terminal-based console frontend for Jupyter kernels.
     This code is based on the single-process IPython terminal.
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index b5ba1d3edfaf..40288d54c967 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_core-4.6.1.tar.gz 66693 BLAKE2B f4338a015ac4b3e0a7cd2497a660bfca0deb96ffa2371fa9c72656f8a68b6f80fe5d494be79c8fdccbcb51f3d9122fd7d4b3e36864d38e7da1c5029c6b1aa24d SHA512 baf0c5db4f78a3cee83940ace80b48ba308c47eeafcf584120b8ba82768c15448fb789ec5b9ac8d541cbd1bfdd47a988f79130675c5943a67d3135d428b43cbe
+DIST jupyter_core-4.6.3.tar.gz 67305 BLAKE2B 7c6a32bd8ce773b7bc4156eabf75597112716632179736b19be4b0e73eba7c5c67a0c9d2d141b952d72b68aff826227b0004a3bc9f3b286b68eb1375f2316bdb SHA512 3c7370c24a4cf53c9747e9e411852d207c0c7035809dab7cb018ccb53e19208df25ad4f728531e47f3a42c4d9694c3e1ed7b03133de23bcbdeb346c319f5f51f
 EBUILD jupyter_core-4.6.1-r1.ebuild 1077 BLAKE2B 811c274e81f9e8b5ffa2b13f9320879c3bcab774daba8c066f5d85bdf3e2ad58a6b165495ecc69c8db44f3e8bb7e86b28d80d8af0da1bfda98abde3841d2321d SHA512 19633ae6f33235f194379e8795a5af0602e4486917b4b9ceab6b170a45a23e640875961f0db0c1090a59b6436fa6b74565f48999e4c99599e0401e5e20e02892
-MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
+EBUILD jupyter_core-4.6.3.ebuild 823 BLAKE2B 7b497e6acabff002ccdf8d5b6926db693fc800ffb79d9a4114dce6ed438b4ffea1d5204880acfee7b020256e01653af550f72330b38b0285a657ea2919ee1bf8 SHA512 df825e9d1554647c86a087818df08b64091db134872bd78dc9df80bfc7f72af7912f9c29b747cae8a09c1cba22cdc218e0764e78cdc7e3aff8c431a60aeca656
+MISC metadata.xml 733 BLAKE2B 1ac253b8e7dedbbb5291296d40d16280514f3a12fd3c905d32690cdefebb1844e60cd0ab516d04feb8a947f32a86ec4f2813c3edb2dc48638c734fb207adf825 SHA512 e180aa5a798b8e7fac09d83f7125058ece7e2ed9be722de31616f09408e46d87153c88345615af2d4691f155ea3999b4d83c4c6e21360068af469181ce13bef8
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
new file mode 100644
index 000000000000..0891fa649da7
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.6.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+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/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
+
+src_prepare() {
+	# rely on imports working without PYTHONPATH
+	sed -e 's:test_not_on_path:_&:' \
+		-e 's:test_path_priority:_&:' \
+		-i jupyter_core/tests/test_command.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
index dd311505a57e..663e35ebd3a6 100644
--- a/dev-python/jupyter_core/metadata.xml
+++ b/dev-python/jupyter_core/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     Core common functionality of Jupyter projects.
     This package contains base application classes and configuration
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 3f8ae27f9e13..fe6a84ae847f 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,3 @@
 DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
-EBUILD kaitaistruct-0.8.ebuild 390 BLAKE2B 97a98d89de43063a8fd500c721626c6a3bd5ab04f435fbc3928c5e785d9e8c198b8d2acd6e0324094ebc93dbfdc0c1b8ce77043d828a245a41f186894e08987d SHA512 005fd4c66f988c7e4aceffaf89ac7cefcc1208fb8a583d799a682a6e34c03fb11fc7533e0555c595d232858b4a663ec433232cecd32cf90bfe3abe89d5e58cca
+EBUILD kaitaistruct-0.8.ebuild 394 BLAKE2B 5d47f200a12dacd51fb073766d85630b595bfed39b95d0204998e52947ce50a9839b2152c2dd1882f25ee12e126345c344ecbd7830d43b498e6eb553c942cf15 SHA512 213c04cbdedb5df7d7ab2af06dbafb5e818e58a406f724739292bfd45f20dab85542b29dc5581135f790c0fb33ed629804d28a1f3a9816eb235452724948101c
 MISC metadata.xml 169 BLAKE2B 21efaa2ec5fcac1a8cf109ad11001875d2c1327d6765bf71d06666699dc6eab3eed845895cc55a6a1d57358bfe6a6fefcbef1f616d6c259ee725a526e10b5a05 SHA512 5192868b5508b672a7e4e119ffd5a730dca1630781ec37fd20b74e2370521c83dd9020d7bb1379cf911f643a57e4a1e6578f89b64b6e3486571b58fd06e7b88d
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
index c932baa405ff..626735a49c23 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index d679d3e41d63..0ab0a218c9e1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -3,5 +3,5 @@ AUX keyring-19.3.0-tests.patch 939 BLAKE2B 8537c22ba56a24e5f8fee3907023098dbbdaf
 DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
 DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
 EBUILD keyring-19.3.0.ebuild 1643 BLAKE2B c902a24962b88f11287b55e957a10c50410dead3a252d0827edb6bb72747b7e0686a896b93be67aac3e60f066ace99addc3f798a853d69374b6761b4b54019a9 SHA512 5ef0899592a3284f2a05de1a66b846532af35de7143a5f57b7933dad689cd1a2b94de5b83ca0038a8288c402ddb71ba538eb0f48885496a986f221aea30c5e78
-EBUILD keyring-21.2.1.ebuild 1250 BLAKE2B c5254e6e748ac3b97dc70c10b3cddae10028afcd63fd29637d58576cb1dc44da6b4bf3e7a874efb1df2db79dd306bb2cb3d043cd1d2077021f38a45218dee50e SHA512 2cf1001a95621e408efa11ed667227382715bd36fe81ce5347be1d06509756bcfc02157b3eb5f07c52f005dc61bd915a88b2dbd72ba4c5410c6d78dee70d04f0
+EBUILD keyring-21.2.1.ebuild 1274 BLAKE2B 09ce045944478da8ded1c129c1510166a28910be93cbf1f1f5efa0b6f22d07f08395e123d1b0a2cb78cf1af43ff9a0eaf1d747e9e3c8e49950b77e6f709bc58c SHA512 0a6cf495b4bfd7da9d4be1fa471bb6ea2f1890552289fd1959dd809799f23bf541f3dbca0c15a6ae7a1e41688cdf532232bfd884700a7b29286e6b01944df7f0
 MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index 3c3edf19bd1f..31150c3125ee 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index b46e561f1792..cf517f12d99e 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,5 @@
 DIST keystoneauth1-3.17.2.tar.gz 253877 BLAKE2B 9a8f10a5a535ee6ee02859f6a7da38777af250303d0be0feed266c677fea3f6bd465e3e14309c38f67dc5886c846a6aa9a9a7438f5e511f7a80782e29ce88b52 SHA512 6ead83db401d9bb31df87da5c9eff576f621d0b0964c9423de6cdd45777b9a2e3cef27fc20d91fc01b82c64b9b0ffcb83f270b4df7b740319809207ed0b2cb2a
 DIST keystoneauth1-4.0.0.tar.gz 256925 BLAKE2B 3ba149f9333a42c8fc2f876cf3ee4533633ed881a90f2fd944ee1c245d94dab548ea1c363f2085bc995dd588d8d355d779d9357885ecd0ee9c73115216010388 SHA512 c24d10b2ae6318c22bd62596dda952a36ec8ede8a6436aa111657a984b2b3be72e55895c009317b2ad652979701d4dca6f2c3e1764ada20d1c7b676f072f5614
 EBUILD keystoneauth-3.17.2.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
-EBUILD keystoneauth-4.0.0.ebuild 864 BLAKE2B 287f2054345eb2c40c9f9d5707e3f5b2944348cc21e70ad1f3592cae9b006a101055993d3ab0e15d6209e078c244d7bd3382deb5189690911d402a7aa5666525 SHA512 8030e324a3eadbfa6352e678d9b5f3fc37ae3ebeac9cb1a3cbd8d52718b5b552c36ab6071d3db8f58e649d24a603635a2aed420cb36d92e5d71b697b9540fa0d
+EBUILD keystoneauth-4.0.0.ebuild 862 BLAKE2B 439cd695e924bd002d7d5d2c31c63b6244389191f6f3d013880d100ece76bddf58d5dcf4040ca1d86e21983f589bef8a09a6f342c09ab5a80bfb76147fba132e SHA512 77125596a8d3268768ec0700b6e99dbd52ea3d90192cd783644d2743065be916a601a879ff29abae7539ad06aa49012f169e0934ada0cd1d7ea22bc8f4710511
 MISC metadata.xml 392 BLAKE2B 085c44de3ed96e035d49d57848f21ae8b2ce65c5e65fbd86e7111e6a132741fc4fdbb57eeb84ec1e2c74822ee622f62b0544be7de22f3959f0e7f3cb82a6d80e SHA512 59fc0c77222f3b620150cbca948d6978b40438bc7e410b984af58fc25ad2cab2b67e22db03b5eb1c76320a7662e02a1d0bfd1c23001153e6ef073473c883e3d2
diff --git a/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
index 84a1f46cc6cb..d60a54111e53 100644
--- a/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index c653ded3db92..aaf0434549aa 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -3,5 +3,5 @@ DIST kiwisolver-1.1.0.tar.gz 55086 BLAKE2B 5f45a9c540a1a732cf8319de7dc2e6b503170
 DIST kiwisolver-1.2.0.tar.gz 54244 BLAKE2B 42590c2cbb78b3c2ed568373616e772326bf5a0e133396d9e9cf6468132ec88b45d40f68f51baff7bc22ca261567ebab81cf2585009657bd2a59df4e97c33f1f SHA512 05541ff46cc64b9958d714452138dc7bb343e6cc9308408a3f8cf25242e9640af37f8bfd22a7038e8ca70a895f57bdb983346259bce22b1630ac10b974d00a0e
 EBUILD kiwisolver-1.0.1.ebuild 538 BLAKE2B b79352b1c0dcd18240b0e93277b765a3d2e00b83462426586c52cec9534c33aadcfa912a7ca984dfd38c7b6aecdf03f909945b8882555b9fbff886859f0d288a SHA512 c6ac78627965c73122b84c78cecfa92766c55b9c6ed2a0a6397edc6880bebd3a60943e16830b671076bc30d77dc107a6b29d56ec8b4660f1be6c8d87696e9221
 EBUILD kiwisolver-1.1.0.ebuild 532 BLAKE2B f3ebb8cb5c1eccda8bedd563582df893debbc73af21e3809ced69ae2f747a035e36d47699fff77c0895da5c24fc89f6df087a124fa2dc2c7b6ab5a5b5834f0d4 SHA512 11a929d9d0806973e634547c02bee6de70a27f580dbc3e8805030c1e61dc14b823ac795092dfa865d410d7552ff85dbf23ee4b664c803bf6803397d5a6d95b33
-EBUILD kiwisolver-1.2.0.ebuild 577 BLAKE2B 6dadf0a8b519b196fef0ce71bf609b24efe8fb1831a345bea7fad4749891c77e02eda653728c5cd0a17773f864a59a85586e739a3637592d4c2ceba8de4d31e9 SHA512 1b0ff9b1f2507397af8faf8c7e2285191549ac752bcaba0412213dc9fc11c34d5d1b120ef050320c2044506f4560d7de6e70e744761c68d2d9678a418e93587c
-MISC metadata.xml 488 BLAKE2B 81301b1703fa5f0b55454baf153da24ded5b76ab63c66fdcea748c6369f903d58836b86678e0e1cdde074c38be7e0d7162a70ef7c38e3211dde320523d77d35d SHA512 f12cd6068772e49e0ff8dbdb319b3018887823c053f8a79061bfcac341480872ecfe0fbcbb53b9afc2caf9105d1935260e0e492fbab3a24c0018db68388ca8e1
+EBUILD kiwisolver-1.2.0.ebuild 571 BLAKE2B 2b911a5cb379e0f87d88ed7e2530ca1507ed4748e25884a2f871d82e7f0cca942c9738525b3157b03159c0482f6f58f8d8cd620563cf883e2b70fc9d65a3ed9f SHA512 e2aa1023324a18fad9c8819766683d93f7b99145147be49cf4a7ef3a01e68b545273a96b34810ff1c8c043d52a62682ca84d12fb898eb18a83f40b9cefcaf295
+MISC metadata.xml 589 BLAKE2B b855a937dd7e70011622983e63e7b227aace077f4fddbf2fdc558a941e446384561b3f0f798e97db23ce0b6cc2f2aab6af9a0eb7e2d6b221c7f511d5145d239a SHA512 df0848bd49ea1b4ff9d1fff0a60e288054c319acf1fd82776b24c07ac1dc8587d2db0d6ab34fb0d194dffa8734b44796b4f2599a20dd8cf6f68b4f68489696a9
diff --git a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
index 8bd3dd4651da..2d2ec37813ab 100644
--- a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
@@ -2,23 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
 HOMEPAGE="https://github.com/nucleic/kiwi"
 SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/kiwi-${PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/kiwi-${PV}
 
 distutils_enable_tests pytest
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
index 4b4e945d1591..edc9848e4967 100644
--- a/dev-python/kiwisolver/metadata.xml
+++ b/dev-python/kiwisolver/metadata.xml
@@ -9,6 +9,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">kiwisolver</remote-id>
 		<remote-id type="github">nucleic/kiwi</remote-id>
diff --git a/dev-python/klein/Manifest b/dev-python/klein/Manifest
new file mode 100644
index 000000000000..1eafea3b7ee8
--- /dev/null
+++ b/dev-python/klein/Manifest
@@ -0,0 +1,3 @@
+DIST klein-19.6.0.tar.gz 100867 BLAKE2B 2d03a5040d7f470bd73b25a66a1dbb2d6278a12afd7ffeffe0055b2d8bf88d5fd6d97e08bdbc185fbfcd34aa0589f79d79488cba77b4b08430dbafd8ba5e0afe SHA512 c0853333269d4d79206446bc7ac333f536eb9dbeea0ada65b23610e4e8a35208820ef1bac78c17a4e71c22ed2c06f5467ce6c59666dc36fde3e4c0843ed69549
+EBUILD klein-19.6.0.ebuild 1392 BLAKE2B a4b186c76dfe95a00ecd5393232e70f1f21667044557691f7aae9cab72616f5605d39835df8a1d444c1060e96e0af3ef3dd2193fdffb7f5ff8f2b6b8009ae538 SHA512 58ce19ea372eb0ef919b20f0f0d5a43a6b0ce3b26e905d8a906032405cf8bcca40bd04f9201e23e5607280a0d9e2c48f5b458ae7284004f9b7b0206cad6a0cda
+MISC metadata.xml 871 BLAKE2B 3c8af447344bf5629b8697933ef90310b1adc29392d7667e72f7b471d8da93da31125f434ab34a1717f9f5f80bf5d478c6e8f8f126eed92dbc54928584fa99da SHA512 6f9bcf2450d43a0f30568c93779c978d136aa9ecdffac561464e276cf29e5a44db60227c98d061072af1ea209d15b85790ef2fd64d4c21d0f7dcf4e280005b48
diff --git a/dev-python/klein/klein-19.6.0.ebuild b/dev-python/klein/klein-19.6.0.ebuild
new file mode 100644
index 000000000000..f89fedf523f1
--- /dev/null
+++ b/dev-python/klein/klein-19.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="micro-framework for developing production-ready web services with Python"
+HOMEPAGE="https://pypi.org/project/klein https://github.com/twisted/klein"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/hyperlink[${PYTHON_USEDEP}]
+	dev-python/incremental[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tubes[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	# nuke irreleveant test dep
+	sed -e 's/"typing",//' \
+		-i setup.py || die
+	# known test fail: https://github.com/twisted/klein/issues/339
+	sed -e 's/big world/big+world/' \
+		-e 's/4321)]/4321.0)]/' \
+		-e 's/not a number/not+a+number/' \
+		-i src/klein/test/test_form.py  || die
+
+	distutils-r1_python_prepare_all
+}
+python_test() {
+	distutils_install_for_testing
+
+	pytest -v ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/klein/metadata.xml b/dev-python/klein/metadata.xml
new file mode 100644
index 000000000000..dab0ec77e4d3
--- /dev/null
+++ b/dev-python/klein/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>hawkowl@twistedmatrix.com</email>
+			<name>Amber Brown</name>
+		</maintainer>
+		<remote-id type="pypi">klein</remote-id>
+		<remote-id type="github">twisted/klein</remote-id>
+	</upstream>
+	<longdescription>
+		Klein is a micro-framework for developing production-ready web services
+		with Python. It is 'micro' in that it has an incredibly small API
+		similar to Bottle and Flask. It is not 'micro' in that it depends on
+		things outside the standard library. This is primarily because it is
+		built on widely used and well tested components like Werkzeug and
+		Twisted.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index aa365e3d2cbb..433662be4b1a 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,5 @@
 DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f705e8e0737c8685c2415e1ca974594377a54764f744cc73ff607668ece3c0999b1a7dad6a259567ac1fd319 SHA512 35113c4f19fe6bf94c374477c89a629f565975a23c16a3cedefa8e0c2a800cabbaa8917d48f732cf28e89cd5430fe8408a3514e055b1858c216b6ea31b4c014a
 DIST kombu-4.6.8.tar.gz 406196 BLAKE2B 43ddb45e7e6a5bc1aff55867a816ebf7a1afed68bd41d9d74b6179a45d951ac4a4f0f687bbaebd23cf81b67fe2b81d47498b3e25eead0822e16d9acbb436338a SHA512 65b4ebb283ae380388de5d9f8fdc1ec0f41a9910744906b23eb150bc62ecb55ae6d65bb96ad31d8a033f26c2a8dc386939fced393866b6467e77a9760dfa17cc
 EBUILD kombu-4.6.3.ebuild 2311 BLAKE2B 3cc134c1c83e228ed750244514d4d0f9e7556efa77361b1660624d8552374fe6af83174ea60e4c6466661f18952aa7a086652dfd0e8e2e99b7bedc95e3ecb0e6 SHA512 74c33f886c0803e35e334dc582c1d7ed3001a5149caf3d3885c3c599733f760839b1cebc36e71ff2c6e227f690eaaa450a08b256b5cf4bab36df54b196348551
-EBUILD kombu-4.6.8.ebuild 2370 BLAKE2B c2b6e27b61d9f0c2b66b8621b05a39510e15e8a4dea59519cd24c1e884f85279ef0e739a4835387e9688cbdc31d03e7e9e32dff9dba699c878e8349152039d04 SHA512 5a508a2eb2db0f31654ce0f153aaed239e66429c5501d44d9e04f3631de0925b74827021d2a9652c37d19cc50edd82d1945adff68c1b47716d863c8e8ad6d722
+EBUILD kombu-4.6.8.ebuild 2368 BLAKE2B 8626497de01426d473a5784a31515b4b3be59c406aa5d7b2b6490de2b4bd8f2404c2a6b1b63c4f1c679e9d70e62268b7ed4cf71083d20ee73674fffe1a320534 SHA512 9a6918db2a8805061f5b7469258ba528135da5a5c009c04978bfc75a76d689c5f2fd8c006db6ed14518ff95d9bed598746511cd18aa89b5fbe8e161c83a3c94b
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.6.8.ebuild b/dev-python/kombu/kombu-4.6.8.ebuild
index 838b1c73c56d..3fb47be86b10 100644
--- a/dev-python/kombu/kombu-4.6.8.ebuild
+++ b/dev-python/kombu/kombu-4.6.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples mongodb msgpack redis sqs test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 279c4346a90f..80d389ebf3be 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0.ebuild 772 BLAKE2B 5ecdc98dfdfb5246c0d7f4f8ed62a2f1fb72b0c19197d1caecac1db8c305fab0ce629409f652e37c33e3582b790c71a8298aa478785a1140d4dd118dca62d772 SHA512 71883c022d571cb0d4a287d5084e74924fbee489bac8b4599d46b8eb319156f44fa680c7de96f28728ed8ac7c19375773a7d458198f0359c36ac29897c0100b9
-MISC metadata.xml 302 BLAKE2B 121d88c715f0ef01faa1e813371b3a6f021ce034816667e62e1048ba9220d8ee4871500fa8e1a54821a4af1134e46ee08e569610c937f50492b135d8b7cc3d15 SHA512 8a62ad98f7c44a165b2e9daf3eb54b37ad4bda18d2d0404a72780e4155298f98c6cfb232dcae693d76cf52f10b2fa4332bd988fb06d56d53165911f194a52400
+EBUILD linecache2-1.0.0.ebuild 719 BLAKE2B 2b3fe267fb67516123bb67427c773c46dbfe7e4211257fbd37d81614b3ac3e9dee53f53d9f1e7d1ae469283606ac693986ee0e48d58d7fbaebc89ef3e80681e6 SHA512 0b202cf29c81b398fb106c9fcb1153071f3e9c00086e6661ed7137e86a1f5b01134db2e50a01659e93d879a9fe85a051cf63ccf68037834c7c3195b49a3381f8
+MISC metadata.xml 377 BLAKE2B 7de50cf7b25ff4a5670c0976205066353aab31ca2c46d14b037253b9843af6a6d973b7a43aec2d213ea4256de851f6ed7accda0aeb1378ba04ae52e69d1c5977 SHA512 577fa842cf618ecfe56bb1661a9b5e124d0f53c204d36df681f2d2601cc797120bbbe9cb863b8aeb268127044c5d2fcc1cf5f21e953262d793d97d9c9ad98aac
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index 21d4c0a310d7..0f3e5e0bdcd4 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -17,16 +17,13 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
-RDEPEND=""
-
 python_test() {
 	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/linecache2/metadata.xml b/dev-python/linecache2/metadata.xml
index c5a2319ffea3..dfdeb6abf1bb 100644
--- a/dev-python/linecache2/metadata.xml
+++ b/dev-python/linecache2/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="pypi">linecache2</remote-id>
 		<remote-id type="github">testing-cabal/linecache2</remote-id>
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 5159470ec73c..9b51476c30dd 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,8 +1,12 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
+AUX llvmlite-0.33.0-llvm-10.patch 1140 BLAKE2B 175f1a5596e7ce1f20e7e89978066cea345af361eb0db9413bf105e657128d45fca1c170aa516d74376f4aa4dcff9699d5c48120378f239c61ee59cc29a61713 SHA512 666e2dd798d2598139a72560ae0a63a397dfb643645c3eb3d92f0d2dfbd3030484b7e59e3aec8fa071d314b974f8d54b1a174473c3fbf4534d69492331ebd456
 DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
 DIST llvmlite-0.30.0.gh.tar.gz 199354 BLAKE2B 71ba1b0572d115a28d838a7fa5daca136fb793d41cdebca5834d2977813b4a02837e99d8b1b48d0fa965c5d3bdfe7783314ecbd2a7e7075b82247ea5fa4f90a4 SHA512 e3a64a3170efe1bffb6eeb8d6cfdc5a9bf8cc9e123da0b317b6b8dd93dacd3a54d5117c22eca43226915e7ff2793ab66cdee00c5e6ada442d9c2f7fed6e40763
 DIST llvmlite-0.32.1.gh.tar.gz 194191 BLAKE2B 4d35ce0f4903a17285b6f6296f0260787cc102804f1144c1b329815d41ca7471e1942aaecac26f06aa76804cc1b8a77130063de22376c78f30819554e459716f SHA512 00ce075deb8048350f4d4ac23e2e8a629b7c12aefefe3855e430aaf5e2df8170cf97a043001397a84101a7d0065671b30eb327837b24f86dd36b855309c19bfa
+DIST llvmlite-0.33.0.gh.tar.gz 196450 BLAKE2B 3b1842b53eabf5cbc30aa642e12d214bd0cf8473f39873ad2b83de830a251ceac20281e2c8a528fff4623faeebf1583ab539cac74587bcb49ccaac22c922a16f SHA512 50b35db717ccc9d78cb7faa2e0b43cf4a622c5fca662ceb18c14163a26456fb79ed844db9a50e4566a2ea5c26089a419ca130d16b18a2486d4137e8a410ee3b9
 EBUILD llvmlite-0.29.0.ebuild 1451 BLAKE2B 0b5f4787b0ebd81640f9b71ce15b2ae93d14777ef20ae2cfee01b24cd1f22c125581759776ad0289d4581492b60be229f27a0e69e1f195c8af5fad719e1b77c2 SHA512 67dcd7ae4afc3b72fefa2484c7392d621866f7cad0fcba4c2f5732baf3f7c5be7f4af036e425167aab02acc366033ff87cbe87463a42ded54b8c85bc3a14ea17
 EBUILD llvmlite-0.30.0.ebuild 1455 BLAKE2B 16be8211b855c6ca41cd7fd86caebfecfe528c0fb9329b247b889aa6a4bbbbe0f67aa2a6548c9c951bd868820e0c98346aef663ccf9c2b2a4deb707f92237f87 SHA512 7d2fb4b689d6a1eccc89051d1beaf827ee18d271746b877c0bc95695ab373bc9aea9421ecdfaa31832a916676deb33863e0c515755593486c9032162733c8909
 EBUILD llvmlite-0.32.1.ebuild 1608 BLAKE2B 2f588519db4c9def2d1bff835cec129fc90a16ca4e9196172d319dae75ecb9331696d591338f80f5e1ec2be6e9374e1be4535a336b71329309c1119dade752f9 SHA512 21e7f355dfa1835cc64849a29fc37bcd2cc46354a25b524e770a0d0083db98f66ed8a7c911c7476b974c46229dcc18046df568440cdd43e190ddc8752475253f
+EBUILD llvmlite-0.33.0-r1.ebuild 1655 BLAKE2B 1770b375b9d01fbfc50d939ea0c44a67243e301bacefe7fd58c45937cc16887dfebea2811a5607515b4f6439d6eeb00061482768c234bfefe328760bb7f64656 SHA512 38c39ec06953791cd24096dd7969d83524d195f3c2cbc913540057a6fcfe853083f60d63b50476c170488c64d6e658abab4f54c4f4492682368ad613b97d07e6
+EBUILD llvmlite-0.33.0.ebuild 1607 BLAKE2B ab085835ea02ccc0729079da07089428625f9e5a196886406facf49cd7cf80614ce71acc9e9b7ee11e24d8518b1adb4250561fd84d3e4742ce93e4ccaf79aa54 SHA512 d24723298c85bf17f218595e0515b168de3157693370a00083cb57473202677ca87909013c5e9274d710d14c0f3473c3ae6de96f404f5a219dbc308efdc3af8a
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/files/llvmlite-0.33.0-llvm-10.patch b/dev-python/llvmlite/files/llvmlite-0.33.0-llvm-10.patch
new file mode 100644
index 000000000000..b6c4242e4459
--- /dev/null
+++ b/dev-python/llvmlite/files/llvmlite-0.33.0-llvm-10.patch
@@ -0,0 +1,32 @@
+From 87a2de4b22e141d37b796dce77a6daef243145eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 11 Jun 2020 09:22:32 +0200
+Subject: [PATCH] Use std::make_unique on LLVM 10
+
+LLVM 10 removes llvm::make_unique in favor of std::make_unique.
+However, this requires C++14 and is therefore unsuitable for LLVM 9
+that forces -std=c++11.  Update the code to use both conditionally.
+This fixes all issues with LLVM 10.
+---
+ ffi/linker.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffi/linker.cpp b/ffi/linker.cpp
+index 57bb80b..585b261 100644
+--- a/ffi/linker.cpp
++++ b/ffi/linker.cpp
+@@ -42,7 +42,11 @@ LLVMPY_LinkModules(LLVMModuleRef Dest, LLVMModuleRef Src, const char **Err)
+     auto OldDiagnosticHandler = Ctx.getDiagnosticHandler();
+ 
+     // set the handler to a new one
++#if LLVM_VERSION_MAJOR >= 10
++    Ctx.setDiagnosticHandler(std::make_unique<ReportNotAbortDiagnosticHandler>(errstream));
++#else
+     Ctx.setDiagnosticHandler(llvm::make_unique<ReportNotAbortDiagnosticHandler>(errstream));
++#endif
+ 
+     // link
+     bool failed = LLVMLinkModules2(Dest, Src);
+-- 
+2.27.0
+
diff --git a/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
new file mode 100644
index 000000000000..5b5f7d1db25e
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-llvm-10.patch
+)
+
+src_prepare() {
+	# test_version hardcodes permitted versions
+	# test_parse* relies on exact error message
+	sed -e 's:test_version:_&:' \
+		-e 's:test_parse_bitcode_error:_&:' \
+		-i llvmlite/tests/test_binding.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+
+	export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/llvmlite/llvmlite-0.33.0.ebuild b/dev-python/llvmlite/llvmlite-0.33.0.ebuild
new file mode 100644
index 000000000000..89ee4202cbb9
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.33.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=9
+
+RDEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# test_version hardcodes permitted versions
+	# test_parse* relies on exact error message
+	sed -e 's:test_version:_&:' \
+		-e 's:test_parse_bitcode_error:_&:' \
+		-i llvmlite/tests/test_binding.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+
+	export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/lmfit/Manifest b/dev-python/lmfit/Manifest
new file mode 100644
index 000000000000..cd068b6bb20a
--- /dev/null
+++ b/dev-python/lmfit/Manifest
@@ -0,0 +1,3 @@
+DIST lmfit-1.0.1.tar.gz 258368 BLAKE2B bd2956cb9519f9303d0d2707b0333839ce471f62f53c907870bb6b8ab867cbcd1581d82a1959a6c3c734bd6b8074a769f0587706b3172800cbdef979db3a148d SHA512 1ae3e2cb25625a9b24c261d81c8f1ba0389266724581762f6e0a96140c84e43acd527ab1b83b862bf7b3b4c0b1b9755ee38d0c52e63fe89ea41f2d010b1e5c0d
+EBUILD lmfit-1.0.1.ebuild 676 BLAKE2B d650da94fd0e282d4fb6ac92fde9089fc37b4a66ace5362cca8f3d11a425128c1c30193e7500a782110eca76b6307f2ccff6b73f24c5b7853315b1c9197c463e SHA512 0aaaf0be849e7e83504763ed27f82bd38b3f8187e64d531884648b21f8ab01f75e22790c991ffc3bd0609a64b3796c4286bcc1b4f97a1311ae7de842f26f6231
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/dev-python/lmfit/lmfit-1.0.1.ebuild b/dev-python/lmfit/lmfit-1.0.1.ebuild
new file mode 100644
index 000000000000..3b27e1c92c05
--- /dev/null
+++ b/dev-python/lmfit/lmfit-1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+inherit distutils-r1
+
+DESCRIPTION="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
+HOMEPAGE="https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	>=dev-python/asteval-0.9.16[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.2[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lmfit/metadata.xml b/dev-python/lmfit/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/dev-python/lmfit/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index e332cef3f4f9..8f4d356ee38b 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,3 +1,5 @@
 DIST locket-0.2.0.tar.gz 3506 BLAKE2B 10f5c325036b5c0880c2b0261de180ee9d046ac346a64612d680170fad8664bcbd681954384bb6b9c4f812059b4418c618ee44f638ac6fc1c35b62786afe555c SHA512 ed9bb25f3fcaa70386217716db5612bf31a923c669cbdb8e871de6df4c0c42bf3309604a1aac804c0f334aed8c88b0ba113d8d265054c0e87793c7b53f729ff9
+DIST locket.py-0.2.0.gh.tar.gz 5598 BLAKE2B 9b8a1b3d4c3fed3e9ab8f37a1e7bd9d0aa65e618985368691802b1b66d0dbdeb7a1635ff72efec8a7351ce31ffc00413d5ee388e520057bf181a18a39ef46f0a SHA512 e5e5d34daf5c36b0ac4871ce0dec50c67b504be16755e38d7721e40c4f2c385c022c305ac1a9bd641ba9eaf45a2693a4a77b6fa6e95d6ae5ab34947e4ac30393
+EBUILD locket-0.2.0-r1.ebuild 586 BLAKE2B ec79aea6f7912f2d785a5466148209ff7a2da36e54bba0848b7cadff3b701078c6f9da6711c9eeba18dbc4794ec7be8c9eeb841ff600299eb782a1000d0aff57 SHA512 cf4c593abb9559a4e8af3f9023facd89b5f82e72a427b894edafb4ad4d3442109f0b24e319b72a84531bd4b9fa315f264193d32a84ec1c31cd05bc1cc75b7411
 EBUILD locket-0.2.0.ebuild 440 BLAKE2B 24919155d14f3700e68919a9aa7519bb606c0a982568a08f5fea5b3c79afebdfe7415681e04b343c9321293f8d8c043fb328c23ee78d691ed86f13ea97bad2e1 SHA512 f83e7b3faaa6aae7e8773d1f7ec01c80c72ee71aebdbc6301edaa11bf6cb1a1010693589805af10ea14693383beef2e12bbcc69beb2426a3f3722c21725ebc21
-MISC metadata.xml 534 BLAKE2B a6497888f2b3c5654969c9f4c83214e7703ed888873475f12aa73db09f177d114c9f7eb8e2485ef00d3611c406cf88669e1772758362c603f2aec27d355976fa SHA512 9e37c3571558f195d20d84d2785dd3866c8c035c21d6b62b5c25ea0f4f57ad8fad6e08b0071bc08c21b39d92188c31aeab930a678f0e7d014a7acba8b25d082d
+MISC metadata.xml 382 BLAKE2B 302f92403ee0fd1137778bd6e0edd9a89829c64370cde1650784edd3f225c3b7e29b8c9dea93dc7172c64c0082b16be9fb27e1188384b5a70f6c30c5c3c5cfa9 SHA512 71e6d7bb63db336b07549aa2aba9ab6cefb66a005db5df55772dc07a756c84edf13382beb7ee05736b6d8ac7810198695f2dfadbddbacacf5538f8e45e81c032
diff --git a/dev-python/locket/locket-0.2.0-r1.ebuild b/dev-python/locket/locket-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..756579658915
--- /dev/null
+++ b/dev-python/locket/locket-0.2.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+MY_P=locket.py-${PV}
+DESCRIPTION="File-based locks for Python"
+HOMEPAGE="https://github.com/mwilliamson/locket.py"
+SRC_URI="
+	https://github.com/mwilliamson/locket.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? ( dev-python/spur[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests nose
diff --git a/dev-python/locket/metadata.xml b/dev-python/locket/metadata.xml
index 9aea7a2046ad..a445a1d992dc 100644
--- a/dev-python/locket/metadata.xml
+++ b/dev-python/locket/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    Locket implements a lock that can be used by multiple processes provided they use the same path.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">locket</remote-id>
     <remote-id type="github">mwilliamson/locket.py</remote-id>
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index a4193aec34c1..1fdcbc36a57e 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,3 +1,5 @@
 DIST loguru-0.4.1.tar.gz 404393 BLAKE2B 2dec4a346db3652a35a758bb9ce98f29785f47a55a107c0f924005607001adbd6e873095b7212a86bfa66d5d8a24f058d775552c1fa044fabd9813c09f369f26 SHA512 5b7dbac11bbd5c7cb05fe380cf4a3337309614cac77ded3b1f5191c8865d16788cafa7e8da25817787a1ae94e1b6905afe54184d72df81fad08821cdb68c0a53
+DIST loguru-0.5.1.tar.gz 412284 BLAKE2B c28fafd0c9871b56ea05648847d837e0a45c9c0452840c27cb966cc61d7010d41695066dd6723d0987af600cb90fbca499b99354aec2bbe6f1542fd5f7bbe2e9 SHA512 62e53d9a6ec9d6f9b305f1522f0149d22931782d485d21df3e6dbceea9dada269c77de8f69629fb07f28c2afd0b743b4e8d4afb54381b03933a07667a14fb356
 EBUILD loguru-0.4.1.ebuild 656 BLAKE2B c12daee7cc82dd3e3f2f2cbe97618f94baf12320ff29a1ba13a537c55a67f3d0a001217bb8c01353e15b3100347d30a5833bd08ded28362d8d052d51adc9ca98 SHA512 fd591aff2a4fd4c44abb4f0a54c4f67c41a838c89b1ff9820aed1f26096c8552bbbf41d590fd13fffdfd532f62b1cf941c9bdfb1dd1d2d5fa842847dc0384138
+EBUILD loguru-0.5.1.ebuild 658 BLAKE2B a11d2fe151b026c5f169d1740ba69d6b6db3ff1de2004c17c7f065c2991bb13f056a11736d2e37c4a58e3ef0fd047d6450f092fb21bcc44d9729676b99cf5aae SHA512 857ee28f1d196215d7e616035f89688425c39017ee96ca2a102860ab128cdef0b8189d78ddbd6432166e9881804f5c1ea97dd743d4d8b3d6380fd94e7521d6ea
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.5.1.ebuild b/dev-python/loguru/loguru-0.5.1.ebuild
new file mode 100644
index 000000000000..dc03e20e9aa8
--- /dev/null
+++ b/dev-python/loguru/loguru-0.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python logging made (stupidly) simple"
+HOMEPAGE="https://github.com/Delgan/loguru"
+SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/aiocontextvars[${PYTHON_USEDEP}]' 'python3_6')
+	>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
+"
+# filesystem buffering tests may fail
+# on tmpfs with 64k PAGESZ, but pass fine on ext4
+distutils_enable_tests pytest
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index 585fac586a8e..d16dec186559 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,5 +1,5 @@
 DIST logutils-0.3.3.tar.gz 27106 BLAKE2B b029b1767fd385d921a254454090630b31b4a9ff7f71ca7fbf777102bcdc795bd79207f8d9098bb0538a110dfbc8ceef87ffe1443fbb42cad1e6f4879248ea0e SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369
 DIST logutils-0.3.5.tar.gz 27703 BLAKE2B ceeabbc64603da949e771531fd1a7cff6bc760ffa98fcb952eddc5da39d019e202949dc596398ea68397c573cb9c2bace77f8e5462030e68d2f5768444a23b45 SHA512 0194bf4f01e7a29d4211495dc5fead9d4bd5bc1b791d25ff38ad28960a229a9bcdbaa7e6d3b5a4105eef6c9aa159459d6529c2615df113e7ec1ae93aac5cce6c
 EBUILD logutils-0.3.3-r1.ebuild 487 BLAKE2B f1348dac89a6ad33a1255f8ba6a90d3f2a818ea87e2930a64f26df747ce8c90b16adbac24d664116aeff28f451a862b46d40672025207c30eb66d05cbee32f37 SHA512 361b62c73eccc1b673b8dcbd69b9029552f5247b84f14fd2fb3e577dc8309d1690fe2b2e965ff24a12ca81c06ba461d85170e2f52060fec26bc0f391107c2d94
-EBUILD logutils-0.3.5.ebuild 456 BLAKE2B 7e923861de00627df708fcee53f306009210c984ec4da2b6a917fada2c67df1a8327c19d13afa5d1abce1862e7686f3fc3f0107907b34347ca6a25067ef0be62 SHA512 c38c69eefbab11b2cb81e791efba29b4b1aa11ce9b805214fe6898ca340a33dfb4d19f543c3598da8f492f462cde82802fd219f7a554ef98e489a465d2007128
+EBUILD logutils-0.3.5.ebuild 453 BLAKE2B 3e8aed63afa6a6d5ff907130c5fd7002581a557bfda1f8cbd61adcba43ca0bfe2f92118114da74fed8eacc2938f6a0780ff4b3cd2a55a482105aa20ca7cc69eb SHA512 514f582ef0dc0a5e1ccd191b0d1aead348722339fd0144246f98fb18dd56bef41f79b61338748099de82b8e3f98d43dfba42aad1ffec11ee145eac57ce37879a
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.5.ebuild b/dev-python/logutils/logutils-0.3.5.ebuild
index 2e5a0aa26451..4263320bff1d 100644
--- a/dev-python/logutils/logutils-0.3.5.ebuild
+++ b/dev-python/logutils/logutils-0.3.5.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 3cd31fd54ea2..b31f93e8e14e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,5 +1,4 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
-AUX lxml-4.4.2-tests-pypy.patch 17078 BLAKE2B 2dc3bc4f8b1de65f3b287d921880e2632cf3268b0e944846cd641903b382a0065d820093448069fbea318a3bf181b375a441dbf8aa903f0ee71f2ae819358adf SHA512 9a5c021b8cc2cd6cd4a609adb858e582172675aa5bc106ce03f88da95c71d7b2afc04394728e8297b316f6312d338f170a87b4937cda78d78c56e80a3308e3f5
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 AUX lxml-4.5.1-py39.patch 17992 BLAKE2B 17855768819d42b0b67f9a66c5cb1661b71385fb5f28ee275a018497fb55c5da9ae8f8284f38635ac8322ec5ac071ea7dfe496f30dcabde2293e7a6703b3147d SHA512 9c2ea59c526f0ab0a0feaed86d9fca7253582ca8bd09b7ccc6e9638100ab53b5ba716a1c61c311019d13b25cfe72fa28be5cf38eecda1d33e77315f0a7fb166d
 DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
diff --git a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch b/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch
deleted file mode 100644
index 780970897f8e..000000000000
--- a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
-index 435807a5..3999de1f 100644
---- a/src/lxml/tests/test_elementtree.py
-+++ b/src/lxml/tests/test_elementtree.py
-@@ -27,7 +27,7 @@ if this_dir not in sys.path:
- from common_imports import BytesIO, etree, HelperTestCase
- from common_imports import ElementTree, cElementTree, ET_VERSION, CET_VERSION
- from common_imports import filter_by_version, fileInTestDir, canonicalize, tmpfile
--from common_imports import _str, _bytes, unicode, next, IS_PYTHON2
-+from common_imports import _str, _bytes, unicode, next, IS_PYTHON2, IS_PYPY
- 
- if cElementTree is not None and (CET_VERSION <= (1,0,7) or sys.version_info[0] >= 3):
-     cElementTree = None
-@@ -2928,6 +2928,7 @@ class _ETreeTestCaseBase(HelperTestCase):
-         self.assertEqual('TEST', root2[0].get('{%s}a' % ns_href))
- 
-     required_versions_ET['test_register_namespace'] = (1,3)
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_register_namespace(self):
-         # ET 1.3+
-         Element = self.etree.Element
-diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
-index 9dc648eb..1853e546 100644
---- a/src/lxml/tests/test_errors.py
-+++ b/src/lxml/tests/test_errors.py
-@@ -13,7 +13,7 @@ this_dir = os.path.dirname(__file__)
- if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
--from common_imports import HelperTestCase
-+from common_imports import HelperTestCase, IS_PYPY
- 
- 
- class ErrorTestCase(HelperTestCase):
-@@ -27,6 +27,7 @@ class ErrorTestCase(HelperTestCase):
-     def test_empty_parse(self):
-         self.assertRaises(etree.XMLSyntaxError, etree.fromstring, '')
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_element_cyclic_gc_none(self):
-         # test if cyclic reference can crash etree
-         Element = self.etree.Element
-diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
-index d058fad2..b905fdfb 100644
---- a/src/lxml/tests/test_http_io.py
-+++ b/src/lxml/tests/test_http_io.py
-@@ -17,10 +17,11 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir)  # needed for Py3
- 
- from .common_imports import (
--    etree, HelperTestCase, BytesIO, _bytes)
-+    etree, HelperTestCase, BytesIO, _bytes, IS_PYPY)
- from .dummy_http_server import webserver, HTTPRequestCollector
- 
- 
-+@unittest.skipIf(IS_PYPY, "broken on pypy")
- class HttpIOTestCase(HelperTestCase):
-     etree = etree
- 
-diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
-index b8b41063..e8d275b9 100644
---- a/src/lxml/tests/test_nsclasses.py
-+++ b/src/lxml/tests/test_nsclasses.py
-@@ -12,7 +12,7 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- from common_imports import etree, HelperTestCase, _bytes
--from common_imports import doctest, make_doctest
-+from common_imports import doctest, make_doctest, IS_PYPY
- 
- class ETreeNamespaceClassesTestCase(HelperTestCase):
-     
-@@ -49,6 +49,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
-         self.Namespace('ns02').clear()
-         self.Namespace('ns03').clear()
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_ns_classes(self):
-         bluff_dict = {'bluff' : self.bluff_class}
-         maeh_dict  = {'maeh'  : self.maeh_class}
-diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
-index 78035d04..45e73d97 100644
---- a/src/lxml/tests/test_objectify.py
-+++ b/src/lxml/tests/test_objectify.py
-@@ -13,7 +13,7 @@ if this_dir not in sys.path:
- 
- from common_imports import etree, HelperTestCase, fileInTestDir
- from common_imports import SillyFileLike, canonicalize, doctest, make_doctest
--from common_imports import _bytes, _str, StringIO, BytesIO
-+from common_imports import _bytes, _str, StringIO, BytesIO, IS_PYPY
- 
- from lxml import objectify
- 
-@@ -216,11 +216,13 @@ class ObjectifyTestCase(HelperTestCase):
-         expected.update(DEFAULT_NSMAP)
-         self.assertEqual(root.value.nsmap, expected)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_date_element_efactory_text(self):
-         # ObjectifiedDataElement can also be used as E-Factory
-         value = objectify.ObjectifiedDataElement('test', 'toast')
-         self.assertEqual(value.text, 'testtoast')
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_date_element_efactory_tail(self):
-         # ObjectifiedDataElement can also be used as E-Factory
-         value = objectify.ObjectifiedElement(objectify.ObjectifiedDataElement(), 'test', 'toast')
-@@ -377,6 +379,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual("4", getattr(root.c1, "{}c2").text)
-         self.assertEqual("0", getattr(root.c1, "c2").text)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_setattr(self):
-         for val in [
-             2, 2**32, 1.2, "Won't get fooled again", 
-@@ -812,6 +815,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(3, len(root.findall(".//b")))
-         self.assertEqual(2, len(root.findall("b")))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_build_tree(self):
-         root = self.Element('root')
-         root.a = 5
-@@ -841,6 +845,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(value, None)
-         self.assertEqual(value.get(XML_SCHEMA_NIL_ATTR), "true")
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_bool(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -874,6 +879,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(value, objectify.BoolElement))
-         self.assertEqual(value, False)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -881,6 +887,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = "test"
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_intliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -888,6 +895,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = "3"
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_floatliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -895,6 +903,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = "3.72"
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_mul(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -907,6 +916,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertRaises(TypeError, operator.mul, root.s, "honk")
-         self.assertRaises(TypeError, operator.mul, "honk", root.s)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_add(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -917,6 +927,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual("test" + s, root.s + s)
-         self.assertEqual(s + "test", s + root.s)
-             
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_mod(self):
-         s = "%d %f %s %r"
-         el = objectify.DataElement(s)
-@@ -982,6 +993,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(value, objectify.StringElement))
-         self.assertEqual(value, "3.20")
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -989,6 +1001,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = _str("test")
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_intliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -996,6 +1009,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = _str("3")
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_floatliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1003,6 +1017,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = _str("3.72")
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_mul(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1015,6 +1030,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertRaises(TypeError, operator.mul, root.s, _str("honk"))
-         self.assertRaises(TypeError, operator.mul, _str("honk"), root.s)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_add(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1040,6 +1056,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(value, objectify.StringElement))
-         self.assertEqual(value, _str("3.20"))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_int(self):
-         Element = self.Element
-         root = Element("{objectified}root")
-@@ -1056,6 +1073,7 @@ class ObjectifyTestCase(HelperTestCase):
-         value = objectify.DataElement(123)
-         self.assertEqual(hash(value), hash(123))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1072,6 +1090,7 @@ class ObjectifyTestCase(HelperTestCase):
-         value = objectify.DataElement(5.5)
-         self.assertEqual(hash(value), hash(5.5))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float_precision(self):
-         # test not losing precision by shortened float str() value
-         # repr(2.305064300557): '2.305064300557'
-@@ -1091,6 +1110,7 @@ class ObjectifyTestCase(HelperTestCase):
-         s = "2.305064300557"
-         self.assertEqual(objectify.FloatElement(s), float(s))
-   
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float_precision_consistency(self):
-         # test consistent FloatElement values for the different instantiation
-         # possibilities
-@@ -1172,6 +1192,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(value.text, None)
-         self.assertEqual(value.pyval, None)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_unregistered(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1334,6 +1355,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(["why", "try"],
-                           strs)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_cmp(self):
-         XML = self.XML
-         root = XML(_bytes('<root><b>test</b><b>taste</b><b></b><b/></root>'))
-@@ -1361,6 +1383,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(root.b, "")
-         self.assertEqual("", root.b)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_int_cmp(self):
-         XML = self.XML
-         root = XML(_bytes('<root><b>5</b><b>6</b></root>'))
-@@ -1383,6 +1406,7 @@ class ObjectifyTestCase(HelperTestCase):
-         
-     # float + long share the NumberElement implementation with int
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_bool_cmp(self):
-         XML = self.XML
-         root = XML(_bytes('<root><b>false</b><b>true</b></root>'))
-@@ -2052,6 +2076,7 @@ class ObjectifyTestCase(HelperTestCase):
-                           before = [objectify.getRegisteredTypes()[0].name],
-                           after  = [objectify.getRegisteredTypes()[1].name])
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_registered_type_stringify(self):
-         from datetime import datetime
-         def parse_date(value):
-@@ -2522,46 +2547,55 @@ class ObjectifyTestCase(HelperTestCase):
- 
-     # E-Factory tests, need to use sub-elements as root element is always
-     # type-looked-up as ObjectifiedElement (no annotations)
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_int(self):
-         E = objectify.E
-         root = E.root(E.val(23))
-         self.assertTrue(isinstance(root.val, objectify.IntElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_float(self):
-         E = objectify.E
-         root = E.root(E.val(233.23))
-         self.assertTrue(isinstance(root.val, objectify.FloatElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_str(self):
-         E = objectify.E
-         root = E.root(E.val("what?"))
-         self.assertTrue(isinstance(root.val, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_unicode(self):
-         E = objectify.E
-         root = E.root(E.val(_str("blöödy häll", encoding="ISO-8859-1")))
-         self.assertTrue(isinstance(root.val, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_bool(self):
-         E = objectify.E
-         root = E.root(E.val(True))
-         self.assertTrue(isinstance(root.val, objectify.BoolElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_none(self):
-         E = objectify.E
-         root = E.root(E.val(None))
-         self.assertTrue(isinstance(root.val, objectify.NoneElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_value_concatenation(self):
-         E = objectify.E
-         root = E.root(E.val(1, "foo", 2.0, "bar ", True, None))
-         self.assertTrue(isinstance(root.val, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_attrib(self):
-         E = objectify.E
-         root = E.root(foo="bar")
-         self.assertEqual(root.get("foo"), "bar")
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_nested(self):
-         E = objectify.E
-         DataElement = objectify.DataElement
-@@ -2576,6 +2610,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(root.value[0], objectify.IntElement))
-         self.assertTrue(isinstance(root.value[1], objectify.FloatElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_subtype(self):
-         class Attribute(objectify.ObjectifiedDataElement):
-             def __init__(self):
-@@ -2677,7 +2712,8 @@ def test_suite():
-     suite = unittest.TestSuite()
-     suite.addTests([unittest.makeSuite(ObjectifyTestCase)])
-     suite.addTests(doctest.DocTestSuite(objectify))
--    suite.addTests([make_doctest('../../../doc/objectify.txt')])
-+    if not IS_PYPY:
-+        suite.addTests([make_doctest('../../../doc/objectify.txt')])
-     return suite
- 
- if __name__ == '__main__':
-diff --git a/src/lxml/tests/test_xpathevaluator.py b/src/lxml/tests/test_xpathevaluator.py
-index a2df6ddb..0951d5e1 100644
---- a/src/lxml/tests/test_xpathevaluator.py
-+++ b/src/lxml/tests/test_xpathevaluator.py
-@@ -11,7 +11,7 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- from common_imports import etree, HelperTestCase, _bytes, BytesIO
--from common_imports import doctest, make_doctest
-+from common_imports import doctest, make_doctest, IS_PYPY
- 
- class ETreeXPathTestCase(HelperTestCase):
-     """XPath tests etree"""
-@@ -742,8 +742,9 @@ def test_suite():
-         suite.addTests([unittest.makeSuite(ETreeXPathExsltTestCase)])
-     suite.addTests([unittest.makeSuite(ETreeETXPathClassTestCase)])
-     suite.addTests([doctest.DocTestSuite()])
--    suite.addTests(
--        [make_doctest('../../../doc/xpathxslt.txt')])
-+    if not IS_PYPY:
-+        suite.addTests(
-+            [make_doctest('../../../doc/xpathxslt.txt')])
-     return suite
- 
- if __name__ == '__main__':
-diff --git a/src/lxml/tests/test_xslt.py b/src/lxml/tests/test_xslt.py
-index 08d03514..b81716c5 100644
---- a/src/lxml/tests/test_xslt.py
-+++ b/src/lxml/tests/test_xslt.py
-@@ -19,6 +19,8 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- is_python3 = sys.version_info[0] >= 3
-+is_pypy = (getattr(sys, 'implementation', None) == 'pypy' or
-+           getattr(sys, 'pypy_version_info', None) is not None)
- 
- try:
-     unicode
-@@ -2085,8 +2087,9 @@ def test_suite():
-         suite.addTests([unittest.makeSuite(Py3XSLTTestCase)])
-     suite.addTests(
-         [make_doctest('../../../doc/extensions.txt')])
--    suite.addTests(
--        [make_doctest('../../../doc/xpathxslt.txt')])
-+    if not is_pypy:
-+        suite.addTests(
-+            [make_doctest('../../../doc/xpathxslt.txt')])
-     return suite
- 
- if __name__ == '__main__':
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 4b7fc3e9d82b..9d5da619617f 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -6,4 +6,4 @@ AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
 EBUILD m2r-0.2.1.ebuild 1414 BLAKE2B 3767158c460d5f80b2beca40a7341e35268bd66933fd96822d7fa73f339ef38cb68d62226387958bb74116bb185c15436af94a8cc27c8c6bc10a26d396892e35 SHA512 766b5c42697cef00e1b0e5f13f3ba67d40f8fe0ef8e3ebc6c5ddfa77ef0179667dcd69edb2951b8fe23e477a66faace30bf296227dd88a8c42dbc9a373ff5671
-MISC metadata.xml 387 BLAKE2B 9afa0632ca2c8320eef24f538949e83fa74c290c2d0845b097d7d5c9fc8a34534b53766e41acbc6efb4a9c2956a798f54f3ead47fc2d36e489b847612d7ca73e SHA512 1466a5630e24d76f8ef99192d8d8c993b1e6085aee4c38e0750214d119cdfc9bfea3f193a9f47f6bd8c72d5797ec15acdbcbd26e962f53a26722c128281aee6a
+MISC metadata.xml 460 BLAKE2B fc2b57003045116830f1a25dd6cd1f6230a05e1fe14dc2bb7cfcd65c49b1b7d05e405007335a32bbfef95ab660ec5f0c476392f2ab516eb513add9da725abc87 SHA512 b32f1840054745c2985203c25baa12aeaafb2db1fff06f413ef95ad6e72ec7f5f78528db32f06d5b1f600c76f38d13b6ee541c77a2c6e36ba726174375782b26
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
index fa17bcbedde2..36d6bbad5e86 100644
--- a/dev-python/m2r/metadata.xml
+++ b/dev-python/m2r/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>
 		<maintainer>
 			<email>miyako.dev@gmail.com</email>
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index e08b43871c74..c9cdf59a13b3 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,5 +1,5 @@
 DIST mamba-0.11.0.tar.gz 33598 BLAKE2B c52ccbf1fca5dd6f27b4515fa6db65a8a28537e705d734bb126bdc9a4bd4afb5119aabc212f871508f91c21679e7e2215d0c7f13adfaabdf6ea49c942b7b3d64 SHA512 2faf941700800ba0432bfd170d6ff2278e5fc3ba4e85f486d33ed5f07e148284d400e2b02ac0f957a27d47b705fc52b042dc4311bdd175907e307e4dbfa95246
 DIST mamba-0.8.6.gh.tar.gz 15428 BLAKE2B d1c13d2e7b5bd4b18c497e1b1df21c19dfdc19b235c796e8277e96a95b787df56466661b995bcd424e550a2f139e7ff8b5d75e72cabde3af1593edb36321f9f5 SHA512 1ac59c7df23ec5d2abe5123756c438c282be668f615a8737f35478ab314cde8ffde2b02ef78ead1946b9c467362b825f73e0ba7f441ab44a1fd116db9b7f2750
-EBUILD mamba-0.11.0.ebuild 986 BLAKE2B e44be105a257f83bbf133c8e98dacd1cf169484f001b8caa6cbbaa3a17f153aca55fef719070871417d313e5b6e71a176bfd5b864ba8d55dac2e5259b33022be SHA512 cd032e8a9aaa6546e73eab4016a3d6aa546961d8feaad40d007ddfe3e1d99602593b8f19cea9dd3ca40f3cee44375e9be7137e69f3277fda8703adacaa57ad86
+EBUILD mamba-0.11.0.ebuild 985 BLAKE2B 7511d4c66ee08b4c98d41d643d357555fef8f976affa9adc6edc027514fe3bf232379381a713346246cec305ade97929c4826aaaaf2d8cae8f05fc7aa6a6e088 SHA512 3726358cc420f008cb682d4d89207d1af605f8fb7998240b228dda5a34215f8fb4cc464cd8dfdfe3206a03bb563322856925a34fbd06b41c0849fbdb2b8d8590
 EBUILD mamba-0.8.6-r1.ebuild 917 BLAKE2B 84d077583450081e42796de95ff868cc0efdca189f7a2b05bdf52b0a1be05a731f12deacc49cfcb59c2cf7bfc8fedd04be815fc27f6b49ebc7289efbcde2b3f4 SHA512 456d68087911b09109d3ba6916d77d2d75646e6d4b2ff1b1bb35f9e80208c2babe30e1ab98d1e24d10192f76984331b38bd35fae5273ad957644db4f664d7ee9
 MISC metadata.xml 299 BLAKE2B 921f7b7d5add4e7decb67da81d15bc1382bb3c51125d99342a9d8229fbf4cb0336ac13623290d0977ee9db821565bde14a1a5d9769dd5e2b89e333efc2a44d54 SHA512 ea6d9b306c3a8691697cea16a1582c8b5a36b54977534e4937feedc34bb62f4006d57227df48e878174aaaee03229d272bd940f23cc5e831cfbe79b05d827f93
diff --git a/dev-python/mamba/mamba-0.11.0.ebuild b/dev-python/mamba/mamba-0.11.0.ebuild
index c0c67a7b7de3..3f6be0377656 100644
--- a/dev-python/mamba/mamba-0.11.0.ebuild
+++ b/dev-python/mamba/mamba-0.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index ed1a1dac23d5..963203abd3e7 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -3,5 +3,5 @@ DIST markdown2-2.3.8.tar.gz 86850 BLAKE2B e227139d4ac368095872b09bcaac78ad49c7ae
 DIST markdown2-2.3.9.tar.gz 101067 BLAKE2B 4b1ba9e90e2cd370edaff4d61bec9182ca30952351274c4aa508e2e3573a79bac7ab70a1d29d279eb2a94da56a823222a9413b0f3f871f3bd2dfb2ed60621158 SHA512 1be193b27efff9bd084da94cf4121fc91cffda57165333ac644a4ad31b33da62bcda1df0fdb450a02421c0199484de5d6b65131a0afe2dd941c52a3f81bb218d
 EBUILD markdown2-2.3.0.ebuild 680 BLAKE2B 0d565e360c7dab5c87783f941ed041f315f744e3a65c47fdba406115750f6a3f645e61725d54c072cb5f7550cfc987e2adf0a07bb1407f56ec7a6698bb1994c5 SHA512 8c13f71fdc407cf8f368fe4cfbbf1742fce4309ab899ca94b3c55b21bcac5758aa40969bb2b0eb93f64eba7e111959bcf2538fbe66896f32660266cdf1f29116
 EBUILD markdown2-2.3.8.ebuild 638 BLAKE2B dc37eb35566e4c1657a06fe3ec698188bf27668a63bbd59fa829714a2d533eb9194107070932daef84439996add5ed3efbf6e0badb33d8da2ae8efad8799351c SHA512 4683b0218df4bdf3333a06f5c37763a7e422535c51f428d1aafb00d3fb1311d294e570bc8a26480872e0f27822038c162e226607f23d6a97e5873d80557a4d10
-EBUILD markdown2-2.3.9.ebuild 640 BLAKE2B 5165d7e18e28b366b473c0e50fac725e63490dab501229f8aacde7b76fff1833b9810297136392b9295ceb456b7aeaf39541b0b830eed0849854f3f2081976a7 SHA512 1009ef60c89eaa81eedc7131dc01441684d00c0957459bc432af197f94528ddb2a9f4db4a0b1735df95dd0169d39a806a7413943535c1d8427ffa8a8b16b575d
+EBUILD markdown2-2.3.9.ebuild 638 BLAKE2B dc37eb35566e4c1657a06fe3ec698188bf27668a63bbd59fa829714a2d533eb9194107070932daef84439996add5ed3efbf6e0badb33d8da2ae8efad8799351c SHA512 4683b0218df4bdf3333a06f5c37763a7e422535c51f428d1aafb00d3fb1311d294e570bc8a26480872e0f27822038c162e226607f23d6a97e5873d80557a4d10
 MISC metadata.xml 641 BLAKE2B f1c0e61b9c9e1229be9dbc2d913af9398d8ed41dc69afa0d46dcbc3c74aa583eedea6e1c8132de436b10b288f76a9657e3c74f7e546d357bba817e38b01606f6 SHA512 ece3faf6646450ac53797ac77c91f7e7a9953dcc419f98738cb8529722d04fa00a9a0e9fbe0958c2119b6e0909fe1ca6eee50749a133e2aec8b2d242071348f7
diff --git a/dev-python/markdown2/markdown2-2.3.9.ebuild b/dev-python/markdown2/markdown2-2.3.9.ebuild
index ddae999be0a0..34140e887c9c 100644
--- a/dev-python/markdown2/markdown2-2.3.9.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.9.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/matplotlib-python2/Manifest b/dev-python/matplotlib-python2/Manifest
index 7e567a7683fb..b2fc4553c446 100644
--- a/dev-python/matplotlib-python2/Manifest
+++ b/dev-python/matplotlib-python2/Manifest
@@ -1,4 +1,4 @@
 AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
 DIST matplotlib-2.2.5.tar.gz 36678633 BLAKE2B fb3084a2d34a920413c44a23a956ffdcf7a31d521e2d1df50a68c9f17882cb87deebb403ec47154284593b39df24dad72e6352e1427091f795058db11f1d3a1b SHA512 f4771dca4b3c936e0d47f42630759207ccfe11586b3efadb401144b014a600914a6521af4fbe060fa80fd74132c92f1d3b37cac4fea9999ca90300c1dec8391b
-EBUILD matplotlib-python2-2.2.5-r1.ebuild 5006 BLAKE2B 2e7efd825c96482f6799e0d5619178ebe5adf1cf3295e5a0efbe7ea6b28c279b980b28b6e06f5a6cf13b556b9b67dc79191e8b601ed401d7d818591ad63f2f01 SHA512 c0ef61a10eb4a97a9c48dcce10f81861e58b5d4d912ad693aba7cca38db793586c612a186a375c45ffb1b02832585cc851aa4e80f521c72c75950d7bbf191d3e
+EBUILD matplotlib-python2-2.2.5-r1.ebuild 5005 BLAKE2B 90e6ccc861dd0e8c10cf8caaa9b6829d52f88c27abf52c360d65c5a4ac11f4d7f7b335797080ebbda3bd321f82f9818ae8d4c26184febb921ebb7e7b3fbf0019 SHA512 3e544b56fcb02baaf67eb8d20e29b6b3dd20e3f7707597f92010e3cdd23f613723854a03bfdc0edafea1e6337baa8fed89cf27be67de7fa4e7949e04f6e20f81
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
index f0ac8775b1d8..36cd1d8f6be6 100644
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 # 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 excel gtk3 latex qt5 test tk wxwidgets"
 REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 8923ce80e737..398f5f2332d1 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,12 +3,14 @@ AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe
 AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
 AUX matplotlib-3.1.2-no-jqueryui-download.patch 544 BLAKE2B aa5e55ec734f3847579864d2d9133da9b4d483ce91b9418dd275ced1f7367e7ceee728f0f4a271743e50b554980005871982bfabd523d8b20d0bdb0f2966d3f8 SHA512 a5900df8735bc6956ce9ea79334d4eb22f8029b9c025e81ead16d41fb061fb94dfcd8d2e773b70bbb8912469b18e18ec194f5bfce0ec668a5be423f1b9de0d7b
 AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f25043f530f01d38ac3c4b1672b37a0cd52466bd5f6c66957de5a871b30dfea58e42a6f389a005347220e4d73cb97d SHA512 d25b5888a03b82ddf8e8d415905663e4e77041ce17fb37ac3562ba126048373abc1203acfd0643c1544f1d0ac9f3232447c3f60295daa5528346e80142848420
+AUX matplotlib-3.2.1-test.patch 17670 BLAKE2B 7cd7b29ee7025fcdd21496ab0327ba3b78f608a32bac17a0cbdc720da0911cb9e3f2e16097a2e473c11841fe80ca5ebc94f312b54a6dcc27bacb1a2ebd384011 SHA512 113decad09a49c7f4dbd57deb49bf0e22f46f8953a86908bba936ae414254930755861db7e56242c8759e08637ece7d8821c27542a0503747caf3947eda41e93
+DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
 DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
 DIST matplotlib-3.1.2.tar.gz 40909582 BLAKE2B 670907670335ca13ec01f3acf036fd502ce34abd12666b2e0d10867c6115a0fe80039326cee89099471aa6b3bbd25f1ca4aa837072dea624ee41984da9f647be SHA512 2eff3c0525d01824ed758a87f50a3f6094767b580fca1eae4e9dbc2cc972af3d0cc3ac9615e576c5685e8bfc1ec90754bc826635f4f2a919d0b26bbb686cccab
 DIST matplotlib-3.2.1.tar.gz 40325615 BLAKE2B 7fd299f7d3948987e341e4313ed82d15de286a05c9819893e099ccd6c1f861ce5548ec85588a382603011e7710d08d6fc9a4f168f0b5705b0873b97e40d2dd39 SHA512 d6497a3c47eaff9c0d981bc03de5894a3f4a5413cbe320924b1df6d68eb421e548cf4247c035fd636a4403cd2d50071633e6906e795b74ec7d9c4816193e42be
-EBUILD matplotlib-2.2.2-r1.ebuild 6370 BLAKE2B fab5c042e14172c077f62ed4ae9a44800e2d779fd8119a4bc16d343b6702976b8e3e94f9f5b2884e11cd0cf7cafe37cb11418c5c97e5c9be4b1c4e581b5b7972 SHA512 3a618bb2718901cdd4be90679fa248d20e595b32d631f414e3c63c35ff98c58897d0167a0fb11c150808fe44f6cd5641c7bfceb933ad4c09c2d92984fb7e8d28
-EBUILD matplotlib-2.2.4.ebuild 6444 BLAKE2B 5cd558b7df2f7972c37129967a0ed65a084b950be6b4859167c9bf2e23ea28963d441ec6144540c2635782282bd8036d3605a15134894b06b5b7e3424052834e SHA512 f9edb7250a6fb868a24609f107a07ecd8f2f27a8cb5637229dc5fe9e716b5fa6d9b33ae01e01877f31cd8d58251f7af893119fd2ab02be8aec5930d272309d20
-EBUILD matplotlib-3.1.2.ebuild 5828 BLAKE2B 0ab5bcb5ca71e16ef0df465f2028d384e35980a04d01e74f073e149d49170e0a0039e9767a5d5cb1d53c1d0e8428e4212957248427518ae86c8be4dfc013f447 SHA512 6a8a36c474ed647331fba9210d4520d7eac006ca456a75e576fec80272f6fec71634edf4f02c6a7f2508a6e61219e72e7f14cc0582bd4731e42b8e91c8136612
-EBUILD matplotlib-3.2.1.ebuild 6096 BLAKE2B 7beea58ef2b26ead7bb47c5dc03d18c5d68576a1630cc1a1b081ab08e97be45d44a0bc7bf364d0d3f0d35ccd7d7430a895b1bb8972ff5f402b590937a14ef79d SHA512 9e34432f14c80ba365df32894919e32f2db40adacf2f6a282debc865c3e2c070231f5e0644be6e9be5119cbc63c2566f8581ad789c4831781feb637d40b64fe0
-MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
+EBUILD matplotlib-2.2.2-r1.ebuild 6227 BLAKE2B 32c5311bd4ee746cb0a6df097c9a2a2b34725031cbfcde1273b22929b20cf197597502be6722923ccade763e8a690dde0683f50fdaff313465b4bbfd6f5a52de SHA512 dc4c2387720aff34780d625022ee0a0f5806e4313e27cf1885450e6b2564f923d5a73b99534721c455d777bea2d43637a5b61d45b028aa5a22ee2ef2e5642b48
+EBUILD matplotlib-2.2.4.ebuild 6299 BLAKE2B a4513d93def3dd7fe01ef4e237a1ffa7e5e1d49ebb4a4fa04c4de14d02ac28bcb2017102d44002bfe4e0cdbca8e8a8563b862fafe3d06e01de4ac58d6c154619 SHA512 bd4a7941b7807552078f05c7bcce15dc18e8df1e93291c598a5d96d25a901556c69d31a7130406b7192903e5b1f81eca001af23675a03369c5fc42cfaa2110f1
+EBUILD matplotlib-3.1.2.ebuild 5648 BLAKE2B bf5914e115a11e59aba62294131618a33db85780102def607bd794ebab07ad32b3ecdb7ea1192134bc71f0038d777498ab49c9c9040f3ecfc79d0af050e7374c SHA512 6123cd120e844b89a771dad446af7bf5496a5fa7dd24d441de6a459aefa0f49bc1346a41f44ec84552e0eb62cb89543294eecf82f3e74d6c7f22956798a664d6
+EBUILD matplotlib-3.2.1.ebuild 6534 BLAKE2B c537979c12904c6dc88f491b9e4266f1a23b26a044a00f9348c683c03afd2f6b9f6ce791b3b221772c267faef400c683dd6995b3ad42f90593797e1a311a7623 SHA512 c4d946e95769e97e40619cf6044edf27dd5a043bf2fd1cfc6b564b72d7f3eae380f426753687ee53fd545860c67cdf285d2c09698994803501908f6076a97eab
+MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch b/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch
new file mode 100644
index 000000000000..281f15405c9b
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.2.1-test.patch
@@ -0,0 +1,432 @@
+From 36e8d90d8065aa5fd1cd83554e6d2e7d031e5b3d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 7 Jun 2020 20:02:48 +0200
+Subject: [PATCH 1/2] Increase image comparison limits
+
+Most of the tests require exact match which apparently doesn't always
+happen in non-pristine environments.  Some of them have very big
+differences due to texlive font rendering changes.
+---
+ lib/matplotlib/tests/test_arrow_patches.py                 | 4 ++--
+ lib/matplotlib/tests/test_axes.py                          | 2 +-
+ lib/matplotlib/tests/test_backend_pgf.py                   | 7 ++++---
+ lib/matplotlib/tests/test_figure.py                        | 2 +-
+ lib/matplotlib/tests/test_legend.py                        | 6 +++---
+ lib/matplotlib/tests/test_pickle.py                        | 2 +-
+ lib/matplotlib/tests/test_units.py                         | 4 ++--
+ lib/matplotlib/tests/test_usetex.py                        | 2 +-
+ lib/mpl_toolkits/tests/test_axes_grid1.py                  | 2 +-
+ .../tests/test_axisartist_grid_helper_curvelinear.py       | 2 +-
+ 10 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index a9409e2c1..0e356e921 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.015),
+                   savefig_kwarg=dict(dpi=100))
+ def test_fancyarrow_dpi_cor_100dpi():
+     """
+@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.018),
+                   savefig_kwarg=dict(dpi=200))
+ def test_fancyarrow_dpi_cor_200dpi():
+     """
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index 93548b279..9910e63c3 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -3653,7 +3653,7 @@ def test_vertex_markers():
+ 
+ 
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.015))
+ def test_eb_line_zorder():
+     x = list(range(10))
+ 
+diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
+index 7843b4101..ddb2991c1 100644
+--- a/lib/matplotlib/tests/test_backend_pgf.py
++++ b/lib/matplotlib/tests/test_backend_pgf.py
+@@ -97,7 +97,8 @@ def test_xelatex():
+ # test compiling a figure to pdf with pdflatex
+ @needs_pdflatex
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_pdflatex.pdf'], style='default')
++@image_comparison(['pgf_pdflatex.pdf'], style='default',
++                  tol=11.669)
+ def test_pdflatex():
+     if os.environ.get('APPVEYOR', False):
+         pytest.xfail("pdflatex test does not work on appveyor due to missing "
+@@ -133,7 +134,7 @@ def test_rcupdate():
+                 'pgf.preamble': ['\\usepackage[utf8x]{inputenc}',
+                                  '\\usepackage[T1]{fontenc}',
+                                  '\\usepackage{sfmath}']}]
+-    tol = [6, 0]
++    tol = [6, 14]
+     for i, rc_set in enumerate(rc_sets):
+         with mpl.rc_context(rc_set):
+             create_figure()
+@@ -161,7 +162,7 @@ def test_pathclip():
+ @needs_xelatex
+ @pytest.mark.backend('pgf')
+ @image_comparison(['pgf_mixedmode.pdf'], style='default',
+-                  tol={'aarch64': 1.086}.get(platform.machine(), 0.0))
++                  tol=1.086)
+ def test_mixedmode():
+     rc_xelatex = {'font.family': 'serif',
+                   'pgf.rcfonts': False}
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index a9e8dfade..7e33bcb3b 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -14,7 +14,7 @@ import pytest
+ 
+ 
+ @image_comparison(['figure_align_labels'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_align_labels():
+     # Check the figure.align_labels() command
+     fig = plt.figure(tight_layout=True)
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index 71499da44..a8bda6e84 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -106,7 +106,7 @@ def test_multiple_keys():
+ 
+ 
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_alpha_rgba():
+     import matplotlib.pyplot as plt
+ 
+@@ -117,7 +117,7 @@ def test_alpha_rgba():
+ 
+ 
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_alpha_rcparam():
+     import matplotlib.pyplot as plt
+ 
+@@ -145,7 +145,7 @@ def test_fancy():
+ 
+ 
+ @image_comparison(['framealpha'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_framealpha():
+     x = np.linspace(1, 100, 100)
+     y = x
+diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
+index 0fad3cdf2..4d2599607 100644
+--- a/lib/matplotlib/tests/test_pickle.py
++++ b/lib/matplotlib/tests/test_pickle.py
+@@ -41,7 +41,7 @@ def test_simple():
+ 
+ 
+ @image_comparison(['multi_pickle.png'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.082}.get(platform.machine(), 0.0))
++                  tol=0.082)
+ def test_complete():
+     fig = plt.figure('Figure with a label?', figsize=(10, 6))
+ 
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index f14425144..7f744da47 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -74,7 +74,7 @@ def quantity_converter():
+ # Tests that the conversion machinery works properly for classes that
+ # work as a facade over numpy arrays (like pint)
+ @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol={'aarch64': 0.02}.get(platform.machine(), 0.002))
+ def test_numpy_facade(quantity_converter):
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -101,7 +101,7 @@ def test_numpy_facade(quantity_converter):
+ 
+ # Tests gh-8908
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_plot_masked_units():
+     data = np.linspace(-5, 5)
+     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
+diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
+index 8d8cf29d0..4cdfe1aaf 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -16,7 +16,7 @@ def usetex():
+ 
+ @image_comparison(baseline_images=['test_usetex'],
+                   extensions=['pdf', 'png'],
+-                  tol={'aarch64': 2.868}.get(platform.machine(), 0.3))
++                  tol=3)
+ def test_usetex():
+     fig = plt.figure()
+     ax = fig.add_subplot(111)
+diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
+index 9ed9a9280..56a3bd14a 100644
+--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
++++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
+@@ -343,7 +343,7 @@ def test_zooming_with_inverted_axes():
+ 
+ 
+ @image_comparison(['anchored_direction_arrows.png'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_anchored_direction_arrows():
+     fig, ax = plt.subplots()
+     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
+diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+index 611908063..dc294aef5 100644
+--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
++++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
+ 
+ 
+ @image_comparison(['custom_transform.png'], style='default',
+-                  tol={'aarch64': 0.034}.get(platform.machine(), 0.03))
++                  tol=0.034)
+ def test_custom_transform():
+     class MyTransform(Transform):
+         input_dims = 2
+-- 
+2.27.0
+
+From c1d6cce894de12bd32095c73d15d4f4f6ff5f2bb Mon Sep 17 00:00:00 2001
+From: Antony Lee <anntzer.lee@gmail.com>
+Date: Tue, 10 Dec 2019 11:18:24 +0100
+Subject: [PATCH 2/2] Rewrite test_cycles to avoid image comparison tests.
+
+They can all be reasonably written by checking the artist properties.
+---
+ .../test_cycles/color_cycle_basic.png         | Bin 33044 -> 0 bytes
+ .../test_cycles/fill_cycle_basic.png          | Bin 70692 -> 0 bytes
+ .../test_cycles/fill_cycle_ignore.png         | Bin 65439 -> 0 bytes
+ .../test_cycles/lineprop_cycle_basic.png      | Bin 41852 -> 0 bytes
+ .../test_cycles/marker_cycle.png              | Bin 44979 -> 0 bytes
+ .../test_cycles/property_collision_fill.png   | Bin 24923 -> 0 bytes
+ .../test_cycles/property_collision_plot.png   | Bin 37723 -> 0 bytes
+ lib/matplotlib/tests/test_cycles.py           | 141 +++++++-----------
+ 8 files changed, 51 insertions(+), 90 deletions(-)
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/color_cycle_basic.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_basic.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_ignore.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/lineprop_cycle_basic.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/marker_cycle.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/property_collision_fill.png
+ delete mode 100644 lib/matplotlib/tests/baseline_images/test_cycles/property_collision_plot.png
+
+diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
+index ee67b4e41..a340b6166 100644
+--- a/lib/matplotlib/tests/test_cycles.py
++++ b/lib/matplotlib/tests/test_cycles.py
+@@ -1,6 +1,4 @@
+-import platform
+-
+-from matplotlib.testing.decorators import image_comparison
++import matplotlib as mpl
+ import matplotlib.pyplot as plt
+ import numpy as np
+ import pytest
+@@ -8,133 +6,96 @@ import pytest
+ from cycler import cycler
+ 
+ 
+-@image_comparison(['color_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
+ def test_colorcycle_basic():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='red', lw=4)
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='green', lw=4)
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='yellow', lw=4)
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='red2', lw=4)
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['marker_cycle.png', 'marker_cycle.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
++
++
+ def test_marker_cycle():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
+                       cycler('marker', ['.', '*', 'x']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='red dot', lw=4, ms=16)
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='green star', lw=4, ms=16)
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='yellow x', lw=4, ms=16)
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
+-    ax.legend(loc='upper left')
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
++    assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.']
+ 
++
++def test_marker_cycle_kwargs_arrays_iterators():
+     fig, ax = plt.subplots()
+-    # Test keyword arguments, numpy arrays, and generic iterators
+     ax.set_prop_cycle(c=np.array(['r', 'g', 'y']),
+                       marker=iter(['.', '*', 'x']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='red dot', lw=4, ms=16)
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='green star', lw=4, ms=16)
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='yellow x', lw=4, ms=16)
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['lineprop_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r']
++    assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.']
++
++
+ def test_linestylecycle_basic():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs + 2
+-    ax.plot(xs, ys, label='solid', lw=4, color='k')
+-    ys = 0.45 * xs + 3
+-    ax.plot(xs, ys, label='dashed', lw=4, color='k')
+-    ys = 0.65 * xs + 4
+-    ax.plot(xs, ys, label='dotted', lw=4, color='k')
+-    ys = 0.85 * xs + 5
+-    ax.plot(xs, ys, label='solid2', lw=4, color='k')
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['fill_cycle_basic.png'], remove_text=True)
++    for _ in range(4):
++        ax.plot(range(10), range(10))
++    assert [l.get_linestyle() for l in ax.lines] == ['-', '--', ':', '-']
++
++
+ def test_fillcycle_basic():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('c',  ['r', 'g', 'y']) +
+                       cycler('hatch', ['xx', 'O', '|-']) +
+                       cycler('linestyle', ['-', '--', ':']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs**.5 + 2
+-    ax.fill(xs, ys, label='red, xx', linewidth=3)
+-    ys = 0.45 * xs**.5 + 3
+-    ax.fill(xs, ys, label='green, circle', linewidth=3)
+-    ys = 0.65 * xs**.5 + 4
+-    ax.fill(xs, ys, label='yellow, cross', linewidth=3)
+-    ys = 0.85 * xs**.5 + 5
+-    ax.fill(xs, ys, label='red2, xx', linewidth=3)
+-    ax.legend(loc='upper left')
+-
+-
+-@image_comparison(['fill_cycle_ignore.png'], remove_text=True)
++    for _ in range(4):
++        ax.fill(range(10), range(10))
++    assert ([p.get_facecolor() for p in ax.patches]
++            == [mpl.colors.to_rgba(c) for c in ['r', 'g', 'y', 'r']])
++    assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', '|-', 'xx']
++    assert [p.get_linestyle() for p in ax.patches] == ['-', '--', ':', '-']
++
++
+ def test_fillcycle_ignore():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('color',  ['r', 'g', 'y']) +
+                       cycler('hatch', ['xx', 'O', '|-']) +
+                       cycler('marker', ['.', '*', 'D']))
+-    xs = np.arange(10)
+-    ys = 0.25 * xs**.5 + 2
++    t = range(10)
+     # Should not advance the cycler, even though there is an
+     # unspecified property in the cycler "marker".
+     # "marker" is not a Polygon property, and should be ignored.
+-    ax.fill(xs, ys, 'r', hatch='xx', label='red, xx')
+-    ys = 0.45 * xs**.5 + 3
++    ax.fill(t, t, 'r', hatch='xx')
+     # Allow the cycler to advance, but specify some properties
+-    ax.fill(xs, ys, hatch='O', label='red, circle')
+-    ys = 0.65 * xs**.5 + 4
+-    ax.fill(xs, ys, label='green, circle')
+-    ys = 0.85 * xs**.5 + 5
+-    ax.fill(xs, ys, label='yellow, cross')
+-    ax.legend(loc='upper left')
++    ax.fill(t, t, hatch='O')
++    ax.fill(t, t)
++    ax.fill(t, t)
++    assert ([p.get_facecolor() for p in ax.patches]
++            == [mpl.colors.to_rgba(c) for c in ['r', 'r', 'g', 'y']])
++    assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', 'O', '|-']
+ 
+ 
+-@image_comparison(['property_collision_plot.png'], remove_text=True)
+ def test_property_collision_plot():
+     fig, ax = plt.subplots()
+     ax.set_prop_cycle('linewidth', [2, 4])
++    t = range(10)
+     for c in range(1, 4):
+-        ax.plot(np.arange(10), c * np.arange(10), lw=0.1, color='k')
+-    ax.plot(np.arange(10), 4 * np.arange(10), color='k')
+-    ax.plot(np.arange(10), 5 * np.arange(10), color='k')
++        ax.plot(t, t, lw=0.1)
++    ax.plot(t, t)
++    ax.plot(t, t)
++    assert [l.get_linewidth() for l in ax.lines] == [0.1, 0.1, 0.1, 2, 4]
+ 
+ 
+-@image_comparison(['property_collision_fill.png'], remove_text=True)
+ def test_property_collision_fill():
+     fig, ax = plt.subplots()
+-    xs = np.arange(10)
+-    ys = 0.25 * xs**.5 + 2
+     ax.set_prop_cycle(linewidth=[2, 3, 4, 5, 6], facecolor='bgcmy')
++    t = range(10)
+     for c in range(1, 4):
+-        ax.fill(xs, c * ys, lw=0.1)
+-    ax.fill(xs, 4 * ys)
+-    ax.fill(xs, 5 * ys)
++        ax.fill(t, t, lw=0.1)
++    ax.fill(t, t)
++    ax.fill(t, t)
++    assert ([p.get_facecolor() for p in ax.patches]
++            == [mpl.colors.to_rgba(c) for c in 'bgcmy'])
++    assert [p.get_linewidth() for p in ax.patches] == [0.1, 0.1, 0.1, 5, 6]
+ 
+ 
+ def test_valid_input_forms():
+-- 
+2.27.0
+
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index a4c0390e0f30..9503034ec4c0 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -19,19 +19,15 @@ SLOT="0"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
+IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
 REQUIRED_USE="
 	doc? ( ${PY2_FLAGS} )
 	excel? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
+	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -51,11 +47,6 @@ COMMON_DEPEND="
 	>=media-libs/qhull-2013
 	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
 	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
 
 # internal copy of pycxx highly patched
@@ -85,7 +76,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	${PY2_DEPEND}
@@ -93,7 +84,8 @@ RDEPEND="${COMMON_DEPEND}
 	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
+	)
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
@@ -201,7 +193,8 @@ python_configure() {
 		EOF
 	else
 		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
+			gtk = False
+			gtkagg = False
 			$(use_setup wxwidgets wx)
 		EOF
 	fi
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
index 738f51416fb1..824ae05fff3f 100644
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -18,18 +18,14 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
 REQUIRED_USE="
-	gtk2? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
+	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -49,11 +45,6 @@ COMMON_DEPEND="
 	>=media-libs/qhull-2013
 	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
 	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
 
 # internal copy of pycxx highly patched
@@ -84,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	${PY2_DEPEND}
@@ -92,7 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
+	)
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
@@ -203,7 +195,8 @@ python_configure() {
 		EOF
 	else
 		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
+			gtk = False
+			gtkagg = False
 			$(use_setup wxwidgets wx)
 		EOF
 	fi
diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
index db457aa8b799..91b2099a971d 100644
--- a/dev-python/matplotlib/matplotlib-3.1.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
@@ -12,21 +12,20 @@ DESCRIPTION="Pure python plotting library with matlab like syntax"
 HOMEPAGE="https://matplotlib.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-SLOT="0"
 # Main license: matplotlib
 # Some modules: BSD
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	test? (
-		cairo latex qt5 tk wxwidgets gtk3
-		)"
+REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )"
+# tests are fixed in 3.2.1, this version is beyond repair
+RESTRICT="test"
 
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
 COMMON_DEPEND="
 	dev-python/cycler[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
@@ -41,9 +40,6 @@ COMMON_DEPEND="
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
 	wxwidgets? ( dev-python/wxpython:*[${PYTHON_USEDEP}] )"
 
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
 DEPEND="${COMMON_DEPEND}
 	dev-python/versioneer[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -67,7 +63,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
@@ -162,6 +158,8 @@ python_configure() {
 		tests = $(usex test True False)
 		[gui_support]
 		agg = True
+		gtk = False
+		gtkagg = False
 		pyside = False
 		pysideagg = False
 		qt4 = False
@@ -170,6 +168,7 @@ python_configure() {
 		$(use_setup gtk3)
 		$(use_setup qt5)
 		$(use_setup tk)
+		$(use_setup wxwidgets wx)
 	EOF
 
 	if use gtk3 && use cairo; then
@@ -177,20 +176,6 @@ python_configure() {
 	else
 		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
 	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
 }
 
 wrap_setup() {
diff --git a/dev-python/matplotlib/matplotlib-3.2.1.ebuild b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
index 20dfaaa499ee..5f616ebccb19 100644
--- a/dev-python/matplotlib/matplotlib-3.2.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
@@ -3,35 +3,31 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 DISTUTILS_USE_SETUPTOOLS=bdepend
-
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
 
+FT_PV=2.6.1
 DESCRIPTION="Pure python plotting library with matlab like syntax"
 HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
 
-SLOT="0"
 # Main license: matplotlib
 # Some modules: BSD
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
 
-REQUIRED_USE="
-	test? (
-		cairo latex qt5 tk wxwidgets gtk3
-	)
-"
-
 # internal copy of pycxx highly patched
 #	dev-python/pycxx
-
 RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
@@ -70,7 +66,9 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
 	)
 "
 
@@ -92,22 +90,37 @@ BDEPEND="
 		dev-texlive/texlive-latexrecommended
 		>=media-gfx/graphviz-2.42.3[cairo]
 	)
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
 "
 
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 pkg_setup() {
 	unset DISPLAY # bug #278524
 }
 
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
 use_setup() {
 	local uword="${2:-${1}}"
-	if use ${1}; then
+	if use_supported "${1}" && use "${1}"; then
 		echo "${uword} = True"
 		echo "${uword}agg = True"
 	else
@@ -131,14 +144,21 @@ python_prepare_all() {
 #	EOF
 
 	local PATCHES=(
-		"${FILESDIR}"/${PN}-3.1.2-qhull.patch
+		"${FILESDIR}"/matplotlib-3.1.2-qhull.patch
+		"${FILESDIR}"/matplotlib-3.2.1-test.patch
 	)
 
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
 	sed \
 		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
 		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
 		|| die "sed pyparsing failed"
 
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
 	hprefixify setupext.py
 
 	rm -rf libqhull || die
@@ -147,10 +167,6 @@ python_prepare_all() {
 	mkdir "${XDG_RUNTIME_DIR}" || die
 	chmod 0700 "${XDG_RUNTIME_DIR}" || die
 
-	local freetype_version
-	freetype_version="$(best_version media-libs/freetype | sed -r -e 's/.*-([0-9].*[0-9])(-r[0-9]+|$)/\1/g')"
-	sed -i -r -e "s:(LOCAL_FREETYPE_VERSION =).*:\\1 \"${freetype_version}\":g" setupext.py lib/matplotlib/__init__.py || die
-
 	distutils-r1_python_prepare_all
 }
 
@@ -176,6 +192,8 @@ python_configure() {
 		tests = $(usex test True False)
 		[gui_support]
 		agg = True
+		gtk = False
+		gtkagg = False
 		pyside = False
 		pysideagg = False
 		qt4 = False
@@ -184,6 +202,7 @@ python_configure() {
 		$(use_setup gtk3)
 		$(use_setup qt5)
 		$(use_setup tk)
+		$(use_setup wxwidgets wx)
 	EOF
 
 	if use gtk3 && use cairo; then
@@ -191,26 +210,11 @@ python_configure() {
 	else
 		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
 	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
 }
 
 wrap_setup() {
 	local MAKEOPTS=-j1
 	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	unset DISPLAY
 	"$@"
 }
 
@@ -230,11 +234,19 @@ python_compile_all() {
 	fi
 }
 
-python_test() {
-	wrap_setup distutils_install_for_testing
+src_test() {
+	virtx distutils-r1_src_test
+}
 
-	distutils_install_for_testing
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || die
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	local -x MPLLOCALFREETYPE=1
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die
 }
 
 python_install() {
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index d238bedf5ab2..f024fad13338 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -17,7 +17,6 @@
 	</longdescription>
 	<use>
 		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
-		<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
 	</use>
 	<upstream>
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index 7f98e3fd5fdd..032b5783d5d6 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -1,4 +1,4 @@
 DIST matterhook-0.1.tar.gz 3150 BLAKE2B 841b64875d3ecc55c5056a15e07e8c46ac13ec48f1fd2752ec0c3934608172c8970cc4ad6ce984e227bef811aaee9ca2fc352afbf4e4925a6930adf798edbdd3 SHA512 1c9d264fb80b7d6d746f8379c869903e80f0b4a134efb3ca571630fdbe53eb7b1ac244470f7c2f8229cfe54e7597594427e253f35f0b103fc4c4123a935c5193
-EBUILD matterhook-0.1-r1.ebuild 496 BLAKE2B 7fa2d6857b8430c50773e6ae17c6a79b6b1e114c6bf4b7246468e2d07e4c15b475b9735e8feaebe4102014ccd683a462959cae6df0b7d0da15503a30a4e70bb8 SHA512 2c3b9b70a7bde1eb2945e027ba31fe7858c2df5188270992d6bdcf5708e70e8721906621aa5093c65539f1d253ee362301f17584880728195366af6a8d53d379
+EBUILD matterhook-0.1-r1.ebuild 494 BLAKE2B 14f5af598f16368c6d26fc2ed631f32b8d84e58ee5a8d10d0df2dac84279396b0c909d5aa57fb0f3f29cfd381a2665a5c035e81058d5c7937d10e79d182c3c06 SHA512 454d714e7618be61c5da34208d7c5d703875ca70754ef0594d238e78aaf93f1e5203032abfa1970c1ddcf09aed385a53578f70faddf3778e6e1af86343e7f0e7
 EBUILD matterhook-0.1.ebuild 488 BLAKE2B 6a1b674be15e7e5f3f9af63d754230d144cf7101d845f15ae7d188eb8333b41848a49d7fc4d3d7ec95e579dd8e2fee835f2c4f6793392686b464720e877a1c3e SHA512 21c65b7dee596d26e2e6fa85352348757a391c96ebd6228c1ed74551cc1192ed0ef4febea9d54dad93dcc3df4935f10b76ff63a555cc8dc1c3c3a8d95f363cee
 MISC metadata.xml 311 BLAKE2B 53b986a49d3c6615c99e1a79572bf81af5cd3f094d95abb417148c0bbe29bbd4d6f412a18b16d366cf0c9fd487acafebd6d0f192b48b855e8f7db3fe08add8b0 SHA512 0702ce6e8985e0c20f35455802d955e1cc69769de6e92cba5aa5de0edbbb5ed9104c6ebe82cc689d144226d64414001b8ee41a575786f6377f863d6bc0bab1fd
diff --git a/dev-python/matterhook/matterhook-0.1-r1.ebuild b/dev-python/matterhook/matterhook-0.1-r1.ebuild
index 0a9016cec09b..9d01d6ea0b0b 100644
--- a/dev-python/matterhook/matterhook-0.1-r1.ebuild
+++ b/dev-python/matterhook/matterhook-0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index b121dbe9612a..6cc8d79b09eb 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,4 +1,3 @@
-AUX micawber-0.3.2-remove-examples-from-setup.py.patch 652 BLAKE2B b7551df8c1bdc16cbb10b54e071b965a273d4b51192cdf17f50d516580a6b52065d10b46274c1e3a90a063d87fe204111ab65eac2c4a937a9e59728ae9381d9c SHA512 225bfd7c7306170c7c6d0b564c84092b015ac078ac597764c0029613209851e157ae5bfa2e910a5368f540e68c5a01aa44df78511dba753c6d875b8eb144cda5
 DIST micawber-0.5.1.tar.gz 34210 BLAKE2B cc3be0dfdb52a733ff37f249d589f37812c5f6b641b1dd2092faffcfeff9cd79c3989324def721859584280405a28c046ec98aeee3a89106fec0e3f27ed4fede SHA512 888826ced322a0584d827f7e0c58691281d8147e7c3ca9e940493a8beba41fbf6d005b0ca7c4ee6eb8e9c37edea4fb8244aaea9f553b886b1410d91aecbae4ee
 EBUILD micawber-0.5.1.ebuild 670 BLAKE2B 7c8079710773d453e544edb8cafc0df0b0e4bb3fd3c809adec1ab7324765b27aae4671723f0b0fc916028657293e63db0b14f5f29a7d3acb0a369df280f4e432 SHA512 aa101c9f5eccc1e8d666c42628695c175a2fa8da499f3396da30f8ced3145a7fafe3d85838fba267d6f5d9952e15249a60a97a1ed7274e7301879afeda8d7813
 MISC metadata.xml 332 BLAKE2B 1d2fa19b717b98bac1f2ad6fd261ce54360b6185671a3d1a51bc72080a6708196c0abcb5d5226dc0e4c693258caf85476a53d4b19d452b847e67a88adfed275c SHA512 9815d1b8eec3bf22a430737bc5a7dfc9e576f0f5ca79ca318a419dd911af378f94b63a6d457cba32bbf4e4939cea3690bad4e6be918ed79324f06f7eef42aaa0
diff --git a/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch b/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch
deleted file mode 100644
index 3d031e8a91cd..000000000000
--- a/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- micawber-0.3.2.orig/setup.py	2015-03-30 02:08:40.000000000 +0800
-+++ micawber-0.3.2/setup.py	2015-07-20 14:53:42.776972042 +0800
-@@ -13,16 +13,11 @@
-     author='Charles Leifer',
-     author_email='coleifer@gmail.com',
-     url='http://github.com/coleifer/micawber/',
--    packages=find_packages(),
-+    packages=['micawber'],
-     package_data = {
-         'micawber': [
-             'contrib/mcdjango/templates/micawber/*.html',
-         ],
--        'examples': [
--            #'requirements.txt',
--            '*/static/*.css',
--            '*/templates/*.html',
--        ],
-     },
-     classifiers=[
-         'Development Status :: 4 - Beta',
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
deleted file mode 100644
index 08a312c5050a..000000000000
--- a/dev-python/mimeparse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD mimeparse-1.6.0.ebuild 1120 BLAKE2B ab9e47a9ffb6dcec7472f4bc6dea72005beef267eef32e0eb374534fddd6db6f75780428f61a119476de5965dc1656db4b416289bcb8ffe07a86f986ed9abd9c SHA512 ab2a38965e2ea7b03afafaba0f733f6b4eb3ecd5da4b0bd7f1e114623351c8895453493a1763dcdd3c4de4c39a8924ac016a51fe86de5cd2aaf03c049675b7ee
-MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
index 36d511c8f003..b6cac1817ba6 100644
--- a/dev-python/mimerender/Manifest
+++ b/dev-python/mimerender/Manifest
@@ -1,3 +1,3 @@
 DIST mimerender-0.6.0.gh.tar.gz 16677 BLAKE2B 55db5bf97cd65de89271af8713d9dbdebab6254fa2dc62cfcd78394f4333093fdc508ad6e93f104eee2f3d8a1ceb9197353b4ca085e3b4887b4560c2c65c45f6 SHA512 68c584ba8ae608097b739078dd729bd8b5493087901ba281959abdb81d4e6052ff045c487fde4f67744b413bab36d7f938c68b162049ebe33bff642571b8fd98
-EBUILD mimerender-0.6.0.ebuild 680 BLAKE2B ebab9b871d7d4029e5e9d65a40d59ac5f7823c919b371c5b8200a8403862cbbc8a9b525b2ad68acb475ff7798d07760392a2999ef43f4c24acf0eb21a6870a5c SHA512 480829a71caf52508fa51f08a53a0d09ca2aadf7638023f5dfe03e03cf2ce8f7446702de54c8f05f6627e2d45df09beeb0ffcdc210217a526f939e5b785a3d30
+EBUILD mimerender-0.6.0.ebuild 686 BLAKE2B 38cab1f1526fc58afa897136e0c37521a84aa16c0ecc2c05b4e4342933ddadf631f5e5a0daa3a442326a7de15742a530fe7240bab44a4c41df3382fa7e399e39 SHA512 0e8e0b21d9632ba8248b5f3edfd003c7edbbc126e884d999b45055e133eccf04dda4cf8489834d605af2ae119e65a09b4746ba8ab873684af1aba16bc3ac4e91
 MISC metadata.xml 313 BLAKE2B 0af0e6a1a8f423a445bf88ca13d771c3dc7a8e7db97d21446a5c5b7967dc232a18c1062ef01e11dfabea9fe47c36825bb2cf44bac98ef651cbfb5d941cf281ae SHA512 69420483f170abf2482ef947c26bbe7dacda158cc222464d35d18b702694b73b6205fc4d66150265962e28ba1965f7c555ea033778fb04eff73a58ef804e157d
diff --git a/dev-python/mimerender/mimerender-0.6.0.ebuild b/dev-python/mimerender/mimerender-0.6.0.ebuild
index 9c2a32f940a6..9abc68c84b78 100644
--- a/dev-python/mimerender/mimerender-0.6.0.ebuild
+++ b/dev-python/mimerender/mimerender-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-mimeparse[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 41c57e5e0440..09a4657478fd 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -2,6 +2,6 @@ DIST minidb-2.0.2.tar.gz 13928 BLAKE2B 7b6997bd0ed852561c1a45e1d8f63030798c59ebb
 DIST minidb-2.0.3.tar.gz 13992 BLAKE2B 7ccb26625c199517ee63e99b1839037046c29a4c72a26f457ef3b4c22ef1f23b0bf632b37790c2981fd2c08929a39e8f015b4cf890d04d5e9926cd07b5def699 SHA512 90e2c51af64a373a9dce5e6fad94440a8e5ff3136ba4004deebb5f9a7a7f039ebf1b903a361d678771b6e18e951cacbd7392f1fe2df8db04cef04526a07a3ce2
 DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
 EBUILD minidb-2.0.2-r1.ebuild 592 BLAKE2B 53d23badbcd6caa90f6b76359d9f44b85e31f0ec20b3d2f03d671e49e8fe24926899d254f6ba4209425082ebfae4ec441ea71b174a8b9a948b111b3242631e55 SHA512 1d0354576b6a1a174ccc7404fcd4331caf49b72ada41a59635f03df70648abfba0ca32355304bf3868f61eebf822bdd45eb34d7021ec56f58c4e70646c9fde7d
-EBUILD minidb-2.0.3.ebuild 443 BLAKE2B 99af1561fea752e73a9e0c377119f499c0bf5f370279839cfacf995165e74fcf0350fe0be5cdccc55b12eb3807fd102d35f9c3567877a99f620b79c99331b69b SHA512 41630b74ed666d6662665bc8a16cd29ae7e113ec6da38b9cc1da3e54d508e6efc036228d355f057087aeb192ad275e83bf942ea020a055e868e1137688f3c48a
+EBUILD minidb-2.0.3.ebuild 440 BLAKE2B a7093c6d5f6e7c10e9473f7a06526f6b498b0b8f8ac5013a372941d7887586d1d01d3b687269cba0e247b7847c18adb8e4a9c73e1f892a2cc8207e6907f3263b SHA512 701fb99146f30f35e16b9ddf3a92a559220e740cbffccff871fd1409e503897f7c2908a5c62f71716bbf65102999f417f47efceeb5375f9a232edbb8a264433e
 EBUILD minidb-2.0.4.ebuild 445 BLAKE2B c4645c6b95b4622d3fc536f95d2104c40137d479227a3434d6f0971892119b2c04effe98a547bbe546030833370639a012711a0eb11fa64466eb029ec89431f8 SHA512 25822938b715a87de7495503c7bde24ce9baba2a24e3f7a06fcdf16314b5598e98b5ee88326d2a98517806fe483888873a468e406b0b1075ba5516758492f0e6
 MISC metadata.xml 422 BLAKE2B b5d93a5b4470c716205ec803434d612c404f45c9b6ee708a56d57ea120c423cfa86f008bc47ef0690836b3cc92c6eae56c3b97959671d6ea72ad751868d3d94c SHA512 c2b0dbbbabedccc7036eecfd09f403f9a5848c6f71d09a12e5be773506c6ec5a5290f459e8cea9505abcd438e47ff84f8c32ffacf6a62be365bbf8c92f6c64d0
diff --git a/dev-python/minidb/minidb-2.0.3.ebuild b/dev-python/minidb/minidb-2.0.3.ebuild
index 06868ee324b0..2b821d0c6734 100644
--- a/dev-python/minidb/minidb-2.0.3.ebuild
+++ b/dev-python/minidb/minidb-2.0.3.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
index 016c77e3cada..eefd16b8d990 100644
--- a/dev-python/misaka/Manifest
+++ b/dev-python/misaka/Manifest
@@ -1,3 +1,3 @@
 DIST misaka-1.0.2.tar.gz 78702 BLAKE2B a07be5c94098e716d1494c69d84c50f8a78fe3b3a1a21d9a2ecce1c7474de9e493775b50f18cbdfa7c2bfb914fc4229d281282a80523e794de846d0f947238f1 SHA512 ba3ef2e4c66e0e33e21bb554c3e317342929b3d9969aaba7e3dbd745430b3952b6bb7d3142a3049c4de3e3dede7cc68a9810cd43642e014949e4564fcb2cc74d
-EBUILD misaka-1.0.2.ebuild 516 BLAKE2B 39735e5dae4df62e7e3abe03d77cf11f02bcde2f9a5e8b741c90ef5ae3a9135923f8b17c6eda36eab77ab7f1b5f6f5889da5c0ba86156dba172da92698c9a82f SHA512 f93c06fd52d9c1ce7728f3dbe2d1a542686d4be7ba85d361507ab48e139b4a36b08f9f3235bf1e88fe7da46359d1e68c34951a330f53eb188939d6f53a84c825
+EBUILD misaka-1.0.2.ebuild 514 BLAKE2B 8f2038be015dccf62c6cc5b92ccf64f8e1b2e3d2f4555aaf7b3927f4df42e368b862edce8e3e2bc14da6023f24c36db5c9f0664e6e3cee1202d7850e484ce769 SHA512 b32c21fc1245dffa1f0480575556e68fac46ec7a17338757635438a7b5f01f6c999595b3d6ad263337c64021c1f8b623e806f29461aae40ded4d22b08e3cb9cd
 MISC metadata.xml 325 BLAKE2B 5af905c4032f92ed588676973f3525d35f77df80423be95e4e5bc87272ce71c2d685bb26cc09a448716f824e51334f60c716545130a959ca2f6e5d7334760c53 SHA512 bc9e07a67003034cee777f14118c2bf840d6481b61f84d811f42fd714cf9bc08675eaade34d2ac79c8efcb31e56e607156109a0b0984e23037f5744efd045a9a
diff --git a/dev-python/misaka/misaka-1.0.2.ebuild b/dev-python/misaka/misaka-1.0.2.ebuild
index d5020c59225c..0d286e7345db 100644
--- a/dev-python/misaka/misaka-1.0.2.ebuild
+++ b/dev-python/misaka/misaka-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="The Python binding for Sundown, a markdown parsing library"
-HOMEPAGE="http://misaka.61924.nl/"
+HOMEPAGE="https://misaka.61924.nl/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 58f7cc4e7a61..d092041ab54d 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,3 +1,3 @@
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.5-r1.ebuild 466 BLAKE2B 7c09de6bda31f7586e10b9f0011f6d4157c74601cd989bd914ed05ff431e5d752c8b03bae3724d93d899ff1b3214c526351b32ad128bac554b68ce641649d5b9 SHA512 dd83472d358bdfe96609fa92cffcdca76802b26abf2cd9ee9ffc327d75d4189637d87d19512012725b993c09f90ea2ba3499adfedc25b0aa06bc7b49178cc005
-MISC metadata.xml 291 BLAKE2B dca62d0d7e7adf50cf0060332562bc3a6fc361a7f3b3b8ae25c142d93992a26c2b9ccfb0be5fffcd18e359989d4d6f603f46c93b23c2dbfe6283198fbaa7676a SHA512 f67a64d81a33f4356c9011fa9ef6ebe195ca28c6c8b9567f07e0756c7a2f9009e5cbbf5b68e495f9f840e5d75f34fc82e440626c80b024df0797e15d610dc9d8
+EBUILD monotonic-1.5-r1.ebuild 471 BLAKE2B 0e27a2cdbc2176fe1283611036b4339a56c979494aaa3267ac17888987a909a06988e9d828964f847b78fcafb566373df0734939b19cb685f9916eb89b971198 SHA512 3c5c0eaa7a1c4be4bc16394e0f201ce4af35c1e1679788e8f8f1b729c5be0dd38e120f2a0e314218bb6d89f7fff0087dc57849b625e0877d26c4ad5981cad64d
+MISC metadata.xml 366 BLAKE2B e8045b50a2eb6fa77f3f95b4dd4dd775c2c986bb80eeb1e91f8a775e5df484da48ba7ddf32ee19a35c5a09e340880cc27f2fb70c45a371341872cd22ad01dd74 SHA512 d58d7d85046c7ed8b0deef7fcce1e60c720b8fe4789a35b507c0d91c8d2222d01ffb4778986c9715fe61efbab3109278d1ce76433f39397e4865a493d794f94d
diff --git a/dev-python/monotonic/metadata.xml b/dev-python/monotonic/metadata.xml
index f5098fadc75b..14de77d4f1d6 100644
--- a/dev-python/monotonic/metadata.xml
+++ b/dev-python/monotonic/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="pypi">monotonic</remote-id>
 		<remote-id type="github">atdt/monotonic</remote-id>
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index 2d69502b446b..06aea1709212 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 # no tests
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 05edac55d647..548346209740 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -2,6 +2,6 @@ AUX moto-1.3.14-newer-botocore.patch 2398 BLAKE2B ea5ebf10d926cca1e9e5a804317bb9
 AUX moto-1.3.14-tests.patch 2306 BLAKE2B 83bf272204ba9128623ad13bfb4a468d6b2a4e5de89633b7915d2090be44b4a7823ca88ea6a706fd878e40434335a3d381e28b88806f7ed5f402fdb9977837a0 SHA512 549e1e6715f04b56729f5621f2806e8b9192ec9fd6e5bd4cacfdf4a1a5ee48ed8701f0a9acb5b1cc08e40efa4d3dc1ad5ff0821c794e97a9da6288dd3cd1be5a
 DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7864db8a5be4ea9af24ecb59bad3e85c44fa8a7babc16bf66188cb6bef89484f1f302a11e6eec1f8dbf516492 SHA512 1fe7e9d49dadada82f24d6bef1c21419c414e027c21ed1099bd1eab7c269ac5638ed44a29d1557b37562a44b22a7c7251fc1ca8ba88cde6b82d39dbc620aa6a6
 DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
-EBUILD moto-1.3.14-r1.ebuild 2695 BLAKE2B b4fb018b2e5b377e303c35c5180c6a871beb3f6c6cc55cd704a1139f28f13b16dae47627a479513a7a57717475e266cb181b3ca69ef35e9a8461e808a3096fd2 SHA512 6a0fb3629f1333d05fd3dbcf361a2683d6268854b3823f4ac8450c15876b04f80ed48013cd86cb83634a2f6bd6f1ac7e01fc147073e9e0618f39d7a26bde85d8
+EBUILD moto-1.3.14-r1.ebuild 2739 BLAKE2B 1321dc8d002c7e50b0165158613cb8867f5d248ef30ac6265566da73046725e989d2a5abed8077cabc349aa246e048b05e716443407e763873d119a97dc154ef SHA512 9729920041d55f8cb9aa1fd616a60139c151ff3a248798d3f83cfe191cdea2b9bb5226d017a3e5db6cbf9e2c5569df78d7c14c472fe3abefec184a23a317f309
 EBUILD moto-1.3.8-r1.ebuild 2428 BLAKE2B da88df8c1a6c5d180277821ddd25da4d7d6e59e234c8d83663185a26d19233d989c074fca40ad7200617f73f799cbaecdbb96a0e0b1d2b9e3c70c31b7b6d13c4 SHA512 114b88548e04b616ee787bb96c338dda79f66942b58f9072519ec3274196358bc7cc658e675c5cbc3beaaf219b4f54044b06ddcf366f8902852307504b17f440
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r1.ebuild
index f342377fbce4..e73600eb1550 100644
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ b/dev-python/moto/moto-1.3.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -50,6 +50,7 @@ BDEPEND="
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
 		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index 2d9bf1248a14..fec9d11dd689 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,3 +1,7 @@
+AUX mpi4py-3.0.3-py38futures.patch 4779 BLAKE2B 0e034da4e2237f15f1f6c559f520dc7ffad5ccb344b0b87f444461132919f26b42b861fd86ed4b785b2de176b726c6ac14d5f69aeb4cdac0b6e182cceacb265b SHA512 1193779d8fc0a26845d9435a55b6fea808785f6d2299c3b0fe6ba16c7c8b846d35041ebabe7f51f67aacbd3d1e4a1d334a36ac2b457941b2467cc0ca8a4b30f3
+AUX mpi4py-3.0.3-py38setup.patch 783 BLAKE2B f92a508e2f8c0749135b79c92656662729434b12c4b1d90587bafc02870c934d2aea135b963660835818c0596d0c0635e02af78e2a2b855259d96d252bf1b19d SHA512 0b35ff4d6ebdb7fe0bb117114d68f9823094429bfdab37d8c8ae404d1357bedbe0c75e46ac4ffbbfdc5197adb24f934ecedbce8eb2b00757c00421e1dad912d9
 DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
+DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c
 EBUILD mpi4py-3.0.2.ebuild 1137 BLAKE2B f1f4357752c4db2b6e0dc6ff36e1d440c2e39c32f7f34c3dad8a2f156fba35f13b9765123ee23ddb9bcd3647e3488cd85f537421dde8ac69fae22c0f4449b67c SHA512 111a3074e7eaaf69c84a92f2a657ae17ceb2c6814a102a0b62615c9b44f16ea9b249f8a6fcecb8d19a2d50918b750f6e2bceea875f655684544e0eec242808b6
+EBUILD mpi4py-3.0.3.ebuild 1439 BLAKE2B 321ab070f8fe4b2b060071863cf3eb87c9ab0f780e1b8f92890ec2fa3fcad96e18045f33402e356db3de4c18ec7e57bb5db26b996898995275923452e2b4d1d2 SHA512 168c8f310c9ac68157d9b581293ecfc6647cf6ccb9fbd741da511945826b0436174cf25912679cd1a9350a3434de9771fd65ccec5b47ab7911dc8d1f0f2073d1
 MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/files/mpi4py-3.0.3-py38futures.patch b/dev-python/mpi4py/files/mpi4py-3.0.3-py38futures.patch
new file mode 100644
index 000000000000..53b3aa36b2fb
--- /dev/null
+++ b/dev-python/mpi4py/files/mpi4py-3.0.3-py38futures.patch
@@ -0,0 +1,131 @@
+From 62a7b879051f2029fe46618f8bf9a019bdb96845 Mon Sep 17 00:00:00 2001
+From: Lisandro Dalcin <dalcinl@gmail.com>
+Date: Fri, 25 Oct 2019 12:22:41 +0300
+Subject: [PATCH] mpi4py.futures: Fixes to support Python 3.8
+
+---
+ demo/futures/test_futures.py   |  7 +++++--
+ src/mpi4py/futures/__init__.py | 10 ++++++++++
+ src/mpi4py/futures/_base.py    | 25 +++++++++++++++++++++++--
+ 3 files changed, 38 insertions(+), 4 deletions(-)
+
+diff --git a/demo/futures/test_futures.py b/demo/futures/test_futures.py
+index 925544d..7e03003 100644
+--- a/demo/futures/test_futures.py
++++ b/demo/futures/test_futures.py
+@@ -1157,7 +1157,9 @@ class ThenTest(unittest.TestCase):
+         def transform(a):
+             try:
+                 f = chain.pop(0)
+-                f.set_result(transform(a))
++                r = transform(a)
++                f.__init__()
++                f.set_result(r)
+                 return f
+             except IndexError:
+                 return 42
+@@ -1176,7 +1178,8 @@ class ThenTest(unittest.TestCase):
+         self.assert_(new_f.exception())
+         with self.assertRaises(RuntimeError) as catcher:
+             new_f.result()
+-        assert 'Circular future chain detected' in catcher.exception.args[0]
++        self.assert_('Circular future chain detected'
++                     in catcher.exception.args[0])
+ 
+ 
+ SKIP_POOL_TEST = False
+diff --git a/src/mpi4py/futures/__init__.py b/src/mpi4py/futures/__init__.py
+index d8c00bc..0518d7a 100644
+--- a/src/mpi4py/futures/__init__.py
++++ b/src/mpi4py/futures/__init__.py
+@@ -15,6 +15,14 @@ try:
+         wait,
+         as_completed,
+     )
++    try:  # Python 3.7
++        from concurrent.futures import BrokenExecutor
++    except ImportError:  # pragma: no cover
++        BrokenExecutor = RuntimeError
++    try:  # Python 3.8
++        from concurrent.futures import InvalidStateError
++    except ImportError:  # pragma: no cover
++        InvalidStateError = CancelledError.__base__
+ except ImportError:  # pragma: no cover
+     from ._base import (
+         FIRST_COMPLETED,
+@@ -22,6 +30,8 @@ except ImportError:  # pragma: no cover
+         ALL_COMPLETED,
+         CancelledError,
+         TimeoutError,
++        InvalidStateError,
++        BrokenExecutor,
+         Future,
+         Executor,
+         wait,
+diff --git a/src/mpi4py/futures/_base.py b/src/mpi4py/futures/_base.py
+index cfbd2c0..3eaa512 100644
+--- a/src/mpi4py/futures/_base.py
++++ b/src/mpi4py/futures/_base.py
+@@ -1,4 +1,4 @@
+-# Backport of concurrent.futures._base from Python 3.7
++# Backport of concurrent.futures._base from Python 3.8
+ # pylint: skip-file
+ 
+ # Copyright 2009 Brian Quinlan. All Rights Reserved.
+@@ -61,6 +61,10 @@ class TimeoutError(Error):
+     """The operation exceeded the given deadline."""
+     pass
+ 
++class InvalidStateError(Error):
++    """The operation is not allowed in this state."""
++    pass
++
+ class _Waiter(object):
+     """Provides the event that wait() and as_completed() block on."""
+     def __init__(self):
+@@ -414,7 +418,14 @@ class Future(object):
+             if self._state not in [CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED]:
+                 self._done_callbacks.append(fn)
+                 return
+-        fn(self)
++        try:
++            fn(self)
++        except Exception:
++            LOGGER.exception('exception calling callback for %r', self)
++        except BaseException:
++            raise
++        except:  # old-style exception objects
++            LOGGER.exception('exception calling callback for %r', self)
+ 
+     def result(self, timeout=None):
+         """Return the result of the call that the future represents.
+@@ -527,6 +538,8 @@ class Future(object):
+         Should only be used by Executor implementations and unit tests.
+         """
+         with self._condition:
++            if self._state in {CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED}:
++                raise InvalidStateError('{}: {!r}'.format(self._state, self))
+             self._result = result
+             self._state = FINISHED
+             for waiter in self._waiters:
+@@ -540,6 +553,8 @@ class Future(object):
+         Should only be used by Executor implementations and unit tests.
+         """
+         with self._condition:
++            if self._state in {CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED}:
++                raise InvalidStateError('{}: {!r}'.format(self._state, self))
+             self._exception = exception
+             self._state = FINISHED
+             for waiter in self._waiters:
+@@ -625,3 +640,9 @@ class Executor(object):
+     def __exit__(self, exc_type, exc_val, exc_tb):
+         self.shutdown(wait=True)
+         return False
++
++
++class BrokenExecutor(RuntimeError):
++    """
++    Raised when a executor has become non-functional after a severe failure.
++    """
+-- 
+2.10.5
diff --git a/dev-python/mpi4py/files/mpi4py-3.0.3-py38setup.patch b/dev-python/mpi4py/files/mpi4py-3.0.3-py38setup.patch
new file mode 100644
index 000000000000..877486b40604
--- /dev/null
+++ b/dev-python/mpi4py/files/mpi4py-3.0.3-py38setup.patch
@@ -0,0 +1,25 @@
+From 36e77661b7a879f0ec1eb165c3b5cd0259eb8496 Mon Sep 17 00:00:00 2001
+From: Lisandro Dalcin <dalcinl@gmail.com>
+Date: Sat, 28 Sep 2019 18:10:52 +0300
+Subject: [PATCH] setup: Minor fix for Python 3.8
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 235b115..9c03c49 100644
+--- a/setup.py
++++ b/setup.py
+@@ -336,7 +336,7 @@ def configure_pyexe(exe, config_cmd):
+     libraries = []
+     library_dirs = []
+     link_args = []
+-    if not sysconfig.get_config_var('Py_ENABLE_SHARED'):
++    if pyver >= (3, 8) or not cfg_vars.get('Py_ENABLE_SHARED'):
+         py_version = sysconfig.get_python_version()
+         py_abiflags = getattr(sys, 'abiflags', '')
+         libraries = ['python' + py_version + py_abiflags]
+-- 
+2.10.5
+
diff --git a/dev-python/mpi4py/mpi4py-3.0.3.ebuild b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
new file mode 100644
index 000000000000..123da6c26869
--- /dev/null
+++ b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Message Passing Interface for Python"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/mpi
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/mpi[romio]
+	)
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}/${P}-py38setup.patch"
+	"${FILESDIR}/${P}-py38futures.patch"
+)
+
+python_prepare_all() {
+	# not needed on install
+	rm -vr docs/source || die
+	rm test/test_pickle.py || die # disabled by Gentoo-bug #659348
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	export FAKEROOTKEY=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	echo "Beginning test phase"
+	pushd "${BUILD_DIR}"/../ &> /dev/null || die
+	mpiexec --use-hwthread-cpus --mca btl tcp,self -n 1 "${PYTHON}" -B ./test/runtests.py -v --exclude="test_msgspec" ||
+		die "Testsuite failed under ${EPYTHON}"
+	popd &> /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local DOCS=( demo )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index a1af2f3cea8e..bc834c6689f5 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,5 +1,5 @@
 DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
 DIST multidict-4.7.6.tar.gz 57710 BLAKE2B f08a45d4ce404dbb64d2561ee2328c0aa3a8fbf65483082c11e5e1554bec23e5c711da2350e241308a1239256b942ef6c420e6e51aef342b380cc01f84d4ca72 SHA512 5f90cb04fe2562884c331018a5002e1370e2596e0afd21e4289ab696847a3028a074bbaa6717b3905161f823f8592d6572475307039f8f97c1ac65aad815a6b0
 EBUILD multidict-4.5.2.ebuild 1129 BLAKE2B 017145854cc27f2c1280d8f81fa1fd7204066d36b000c827525d786ee34e78cbd309c7dcba54125dd048973e4a8dc1f16d77206b258e53d7a87a5839e92f481b SHA512 067dc0278f9cdbf3bb61f2ce6530b67000a535d234f010fc6f2066638faef40d9b108c9b0b76dce7a22396b9010b37a41909634386c80e22502f277150133bcc
-EBUILD multidict-4.7.6.ebuild 713 BLAKE2B ed0071dfc91159e76aa760fc63b82d84df1df49d56ed3528971f22d31cc4c57488731961b9888ad1a601fec5deabf8176072ea511ba4d8573d505f3586072eb6 SHA512 936d9fcad53362bce26445211c5bad48b484222f015c51140a5b3b170e75fbfb760d200401019050ea6db441b061712bbad23196e4083eafd8001c8cf0b8ae09
+EBUILD multidict-4.7.6.ebuild 732 BLAKE2B 1d275ecf90899551cc5d44f08bfcdc8642bc8b787f654869e91675eda46b897d0f855b30a423cb65f62ff72d036f20d04859190ef2a545491c5367f1fefee285 SHA512 fd3e5f8072f003227a292f7d61c707a34f090e8338fbd80c2497c5243c89f324443b846a08e6ceb98b69dbe3f828db67b372cf86d29eb3d404f7c0c275c94509
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.7.6.ebuild b/dev-python/multidict/multidict-4.7.6.ebuild
index 5feb6a64655b..80f447507069 100644
--- a/dev-python/multidict/multidict-4.7.6.ebuild
+++ b/dev-python/multidict/multidict-4.7.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 777ff460d345..bf5245c9a44b 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -2,5 +2,5 @@ AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce
 DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
 EBUILD munch-2.3.2.ebuild 503 BLAKE2B bc9c75e8e823ff370cd75d59c326653ac1ff16f0f923d43b600314e42ac2ab9c6672ddd07b2999cf566efaf19a78d7802eaea1f918f6c86bb20930dd5e1a6ce5 SHA512 f4246ccdab778286cac951a7895d98a36916468231902f5c83a9a075ebe025efa475c9105d195d98f431ceff8d4eba564db6763ab646d790e71f2472636f8280
-EBUILD munch-2.5.0-r1.ebuild 714 BLAKE2B 984209e34ae5623bc4a15111e3a3c8a673120db8a506ed53b15d9a24250e8848bad2da55a9d69afb4ff3ad6245fd15b5612468087846d52f4a9c25c3b5fa06f9 SHA512 d557ceae8c915e0caf4292ca1edf8ae6170cafee0fc63fea80cfdf91c52b842ed7df1acc1f33c45180b111f9ae9e5df0beb9520c4cad35a3a30a9c683750108c
-MISC metadata.xml 297 BLAKE2B f25a8e5e6202cf3368d7d979e07e1c0dab3dbdb9fbf6341b51d28910a246d217ac4da6c217550e0618b5df92ca309b68f23844834e9a03082ca841d2d58f428a SHA512 4cb74cf412c11219c7d9cdaa3b7ecac661c890dd225de89640893bca6a77615735138ef8fed3887ac85e6bb06acb8f4aebf344060427b0839aa708da7820938e
+EBUILD munch-2.5.0-r1.ebuild 735 BLAKE2B 00083a872bb052f0802c14331ae55be2a26cee7114317d65a60727c94bced61f3b90d96fa4a6c11552ddb5e0107c0f711141311ce1fe7f2b491b7ae5329ca83d SHA512 7b744d1faf42ac254cb477e111cf238c35b4da77f5b0ffd703843f5fd97ce03b752e95e68ca5222f6b7731b574ad486ad0ab231959ff505d75aeaaaea84366da
+MISC metadata.xml 375 BLAKE2B 55482baad37c27ba7d0ec36732e880b82a635bbf7358e4219d96d0986e56eab1052c7f09d11a2cae544612643b524ca333c7217f92e569d5dc7cf89e025dd53c SHA512 333c300e6d943df9e1d7f43ccb7fb2b96ff13522dca55f8725ab71cf6e4f740d4c11a6bf136a1f1caec79adbafdaac51ea4ec36e0fb1b456edf4f39682036ada
diff --git a/dev-python/munch/metadata.xml b/dev-python/munch/metadata.xml
index 259ce1e47786..bac372eafccb 100644
--- a/dev-python/munch/metadata.xml
+++ b/dev-python/munch/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="pypi">munch</remote-id>
     <remote-id type="github">Infinidat/munch</remote-id>
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 7b59d900eacf..5f016a764937 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index b38ade6cf8b8..1a968a56605a 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3.ebuild 1038 BLAKE2B f7d2be962463430eb84c05cbe8f0901ba0c9a04a9aa90b45cb99a5518dfa7c01e6085f200c1fedde16b05dd930ec2d6f29be1d5c052743b1fb5a88dfb2844b4b SHA512 f1dc9b2037835247a78e0abe5795199a8b575e075956377150c0215100cd7cd9f5d305ac15b650e18414e2ad61d1a6da6e7c3580991e1ac6384054fdd75ca26f
+EBUILD mypy_extensions-0.4.3.ebuild 1025 BLAKE2B 6e531146c9e8c331c64453e6701842bac7d4fb80330a103bdd897d11a10618202cf291a4ab5691b5e7f6ed7dd3c9986f66f9b216f9185b95e284e7784e6a419f SHA512 770e6c1ed105f69d7f8bbb33b6e16b9b5a906962ff81c65efbed6f5a2639cf469a49f09bb284aa1f078da36d7b7cc752e2410cae91d8c18fd979c40ee460c2c4
 MISC metadata.xml 328 BLAKE2B c8305ff15b161dc506756c3a5e9d06fd2d22de1789676d02b610377520d593a594aebe733dfe88d0c88bf235e7c0dbfc16309d57f729365660c9fe9284fa9830 SHA512 6fa42508eacd37f3cdb2b47371baa13f67d985bb4f47237a0f9be5fa27b2ce86670de842abb75ca6c21f8d4255e56be552f5415c66244fe0c5dc99865e61b252
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
index 61bac4041283..0536aa7c3de8 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
@@ -40,9 +40,7 @@ python_compile_all() {
 }
 
 python_test() {
-	local PYTHONPATH="$(pwd)"
-
-	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+	"${PYTHON}" -m unittest discover tests -v || die "tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index 563fb7883497..acd56e06d98a 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 741 BLAKE2B f5cab9a8ba4d549133ba400d37ac98983c62ff3706a68e72ed43fc946ef7dd59a1c6211940cb617bd9e245ce61c70e716dff6c8a87517c545b355e611ac9c572 SHA512 2b4a05d2f5e6e58544d3cca95c929935afcf11b75255ba33c762dbc181bdcbe7537120b4997685c7cb2a4e5088b06e3f6f0a402aada41fe152e09f07a0ad71bf
+EBUILD namespace-repoze-1.ebuild 757 BLAKE2B e969f284ae2f744f87c8db5dfcb62fbfab9169d2602dab2e801e15a88719a615294bf2ceaa6023a6fffdeebf3909c5650c86607ede4cd3f9468de36fa46ee919 SHA512 a6515246df021849f94045b9c37f9db0e1f552cae30dc6381001cae8444b71a2a0085a3ee5dc6e85162421a6f0ba8ea4e7ef9e5a02f4b3051619f6fa122de8bf
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
index 87744ce968b8..07eeacc23b6b 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index 0387d4e388c8..59057dc41421 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 954 BLAKE2B 911fceb4173062bcd29af7ee7e026fee448949a3e2285034b20689dee8c0bf662e20a8d7320d9b3fda346755fe13445ee7be4b44e296334314802533709798ff SHA512 3ad406ecb4d581aa39cc4da12c958cedbdc31be06504d80c5c4bdaa9beda628f33e490294ef3fdcd3520e8315f401621319e80f172f1c13e3cc173ee9176e17b
+EBUILD namespace-sphinxcontrib-1.0.ebuild 953 BLAKE2B 541c16054080a1336600907bd2b3272d2d47bb4b79cc6940817364164c57a3dcafb4f9de4c1ecc6ad4005ed889ec66d089ee04097fd4fe3852b96e98c8cf7418 SHA512 da1d0e816a62d0069785463d8a3724829714a37edfddd33c8b8e343d8a5886140ecb82d09bcf03e4542372709620528be1c5794738df4860a96456fc366ef833
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index e31328fe96e9..6eb0c2ebaede 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for sphinxcontrib"
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 80eed316f9bf..91782c573a37 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,3 +1,5 @@
 DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
+DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
 EBUILD nautilus-python-1.2.2-r1.ebuild 946 BLAKE2B 52f4f4077034a671568e4de1337a7464e62718ea2ce9db39aaaeb7ed53af42acd6c3c4870596ed14c648b8c2ed39c5c145d85599d184df6d3e049a8f09e504cc SHA512 6ea8233389a35c5114a9c73b29586d37c64974b3ab8589378a6d94466375eecea712f3dbe87cfa251f1eae6531ff43302de23b609984a1e5442b56756a68e059
+EBUILD nautilus-python-1.2.3.ebuild 952 BLAKE2B 6354343ec86b42de1cf0db07651468559fbb0ddaee6ac1bd7c767c85e5a4cfc7de653e9a6aef8d2cb0104256b6a37248bf17971457bf094668766d399352501f SHA512 9a4a5a29377a5dca89d3cf57352c61ff692e366010b4e2d60abad9f52aa4835c194367f987aa3cfb705c24216b363767a696a961f8e202dc681c848bb60be38d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
new file mode 100644
index 000000000000..8f8557f2af2e
--- /dev/null
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Python bindings for the Nautilus file manager"
+HOMEPAGE="https://projects.gnome.org/nautilus-python/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Require pygobject:3 and USE=introspection on nautilus for sanity,
+# because no (user) plugins could work without them; configure itself
+# requires pygobject:3 or :2 and >=nautilus-2.32
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=gnome-base/nautilus-3[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	# Directory for systemwide extensions
+	keepdir /usr/share/nautilus-python/extensions
+}
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 96c99eca9994..0df0127104c1 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,9 @@
+AUX nbconvert-5.6.1-inkscape-1.patch 6526 BLAKE2B f3baf2b80321e63a261ad281c81818d95bde8f719382cb8a4b2a2d4511e7c102658fcfec9f86067bb0c296caf9b164842986bb664ca7dc9184206e2a76b20221 SHA512 880385a0c42e185f01521ee26fe9d859c99c6ba3477e5b71d292cc0f6b4998a2b9c4ec0dcff5a30ca3fce261769c3481ec320b6c0ca0e0f46dd493e72b7267b3
+AUX nbconvert-5.6.1-py39.patch 1199 BLAKE2B 7ddcc42c81e9d86007142f3f5c6ce9a88b1ead4400c1e65f3c816e97fbc707eea3bd71a5bf64e6266678c1935a678321230a30d92522f6188f19d3273028647a SHA512 f9590d808cadea8a2c95079dbfe4aac4339ecddcb204e7b57a8c62f4cfd0545d17961b01599ec3f4ce52d772175be43ad441a0ebc56d52e6332fda11110f5463
 DIST nbconvert-5.2.1.tar.gz 510937 BLAKE2B aade38372775b032287f420ea4d335ad949a80afc0df63859db5a4f520bbaa22fcd17bf4318b05fa042fe94c2f65890aa2ed2365206abe8cdfb357817b056ac7 SHA512 c71c95d6c7bda4b55afad792d108d48c27857e060531dc8ec262673971c258ff9480821bd78ee5cbdbb19f107d5f8d19a49eac88819f20a09b450c26681335fa
 DIST nbconvert-5.5.0.tar.gz 583216 BLAKE2B fce42d68fcfb5439607fcb0fa8475462e929a5ddb9d160985956a85e09c7561e1a966be633b4d59e6afe873fb7f1300997c97bdbf4690290401d14bbe351c47a SHA512 4d10cbd6d6854d7672537cfb2e0a79854be1ed4adf96f805b1a0ec0dde0e149ed465a26ceec8d7c325f7011c30ff646054585b65d1e83540622e25a96cc207bf
+DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
 EBUILD nbconvert-5.2.1.ebuild 2119 BLAKE2B a08f56ff246159f89f487e7d4f671d55d64c1e5f0e1fb1ade29d211c84774731f166f0005f25958c560a49f95ff3fe6ea836c556455669e77c4b7c8aee623b8c SHA512 320938050a6f3a3bf7ec2430e04c76443e2410981ce7622d7dca8deaacd2e4e33a8c1b081d3a354e3deb64df333b16fc3e81177a53bc9a343601e09fb35b876e
 EBUILD nbconvert-5.5.0.ebuild 2103 BLAKE2B 45671ea644d557087eae45329e1dc1c869ff2f9ba347de47c5cb1d50497d3af39a6d4f927d75447e3f86988137a25e24edff1bc845b5a97957d5cdf245cf638e SHA512 4ced8cead706d1341d4edacf163f78223855096a48245d619792d80c80ea67bdb43b1fa8f2073d2a124ff4cc5cb72aab7a7df5bf8eb4c34eed0a398197d2f8f1
-MISC metadata.xml 534 BLAKE2B 011d472737f4929968f44c9ab3beaaff8938a4550096b8abc2bc7dc72acfbde4eb745527a6f9ce3d1188bdc09f11607db2d9515a89b53793a88259513cf0056c SHA512 8a00c8bf80e0e9477a531b70d9f2fbba1fc8c8bc09246a6a2263d94170d294e65e6a20f8ab84974e97b346c96b22e2ca648ef5021fc9316a023532ca34bd07d8
+EBUILD nbconvert-5.6.1.ebuild 1776 BLAKE2B 73e15c1584cbf8b935319cdbfe4e5362d686eb4c752ffbf6d4dc43b21fff9930dadfe2e3772ddb2624e9fcb68357d35c7ad5700984091a5e610fd53ea34167a4 SHA512 bb202323abdc76426cf5b5c754909451925b1002f1968a9fde7571b76ea9176bf79ee53d5f4358d5cc1cee6c52d42ea3858bb258445865904f55ac058c51b5ea
+MISC metadata.xml 501 BLAKE2B a99beea687357c74454ec232dea268f95e9b775c882b1ea29e196ec124e829b9749d5fbc4c585f88e46c16bc868d57a757b6f9043545bc5905e0dc86c7f0b44a SHA512 d0735c82e490860baf8ae76f78058a9981dc345d7f5b06d54bbdfd1741a7619f68dbca3386f7bba12b58df46a1125384935de85dff3ad883fb11781df933a866
diff --git a/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch b/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch
new file mode 100644
index 000000000000..1f997a3c3a32
--- /dev/null
+++ b/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch
@@ -0,0 +1,159 @@
+diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py
+index aff14d9f..de51f3b8 100644
+--- a/nbconvert/preprocessors/svg2pdf.py
++++ b/nbconvert/preprocessors/svg2pdf.py
+@@ -1,4 +1,4 @@
+-"""Module containing a preprocessor that converts outputs in the notebook from 
++"""Module containing a preprocessor that converts outputs in the notebook from
+ one format to another.
+ """
+ 
+@@ -17,11 +17,7 @@ from traitlets import Unicode, default
+ 
+ from .convertfigures import ConvertFiguresPreprocessor
+ 
+-if sys.version_info >= (3,3):
+-    from shutil import which
+-    get_inkscape_path = which('inkscape')
+-else:
+-    get_inkscape_path = None
++from shutil import which
+ 
+ 
+ INKSCAPE_APP = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape'
+@@ -46,26 +42,49 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):
+     def _to_format_default(self):
+         return 'application/pdf'
+ 
++    inkscape_version = Unicode(
++        help="""The version of inkscpae being used.
++
++        This affects how the conversion command is run.
++        """
++    ).tag(config=True)
++
++    @default('inkscape_version')
++    def _inkscape_version_default(self):
++        p = subprocess.Popen([self.inkscape, '--version'],
++            stdout=subprocess.PIPE,
++            stderr=subprocess.PIPE)
++        output, _ = p.communicate()
++        if p.returncode != 0:
++            raise RuntimeError("Unable to find inkscape executable --version")
++        return output.decode('utf-8').split(' ')[1]
++
+     command = Unicode(
+         help="""The command to use for converting SVG to PDF
+-        
++
+         This string is a template, which will be formatted with the keys
+         to_filename and from_filename.
+-        
++
+         The conversion call must read the SVG from {from_filename},
+         and write a PDF to {to_filename}.
+         """).tag(config=True)
+ 
+     @default('command')
+     def _command_default(self):
+-        return self.inkscape + \
+-               ' --without-gui --export-pdf="{to_filename}" "{from_filename}"'
+-    
++        major_verison = self.inkscape_version.split('.')[0]
++        export_option = ' --export-filename' if int(major_verison) > 0 else ' --export-pdf'
++        gui_option = '' if int(major_verison) > 0 else ' --without-gui'
++
++        return '{inkscape}{gui_option}{export_option}='.format(
++            inkscape=self.inkscape, export_option=export_option, gui_option=gui_option
++        ) + '"{to_filename}" "{from_filename}"'
++
+     inkscape = Unicode(help="The path to Inkscape, if necessary").tag(config=True)
+     @default('inkscape')
+     def _inkscape_default(self):
+-        if get_inkscape_path is not None:
+-            return get_inkscape_path 
++        inkscape_path = which('inkscape')
++        if inkscape_path is not None:
++            return inkscape_path
+         if sys.platform == "darwin":
+             if os.path.isfile(INKSCAPE_APP):
+                 return INKSCAPE_APP
+@@ -85,22 +104,22 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):
+         Convert a single SVG figure to PDF.  Returns converted data.
+         """
+ 
+-        #Work in a temporary directory
++        # Work in a temporary directory
+         with TemporaryDirectory() as tmpdir:
+-            
+-            #Write fig to temp file
++
++            # Write fig to temp file
+             input_filename = os.path.join(tmpdir, 'figure.svg')
+             # SVG data is unicode text
+             with io.open(input_filename, 'w', encoding='utf8') as f:
+                 f.write(cast_unicode_py2(data))
+ 
+-            #Call conversion application
++            # Call conversion application
+             output_filename = os.path.join(tmpdir, 'figure.pdf')
+-            shell = self.command.format(from_filename=input_filename, 
++            shell = self.command.format(from_filename=input_filename,
+                                    to_filename=output_filename)
+-            subprocess.call(shell, shell=True) #Shell=True okay since input is trusted.
++            subprocess.call(shell, shell=True) # Shell=True okay since input is trusted.
+ 
+-            #Read output from drive
++            # Read output from drive
+             # return value expects a filename
+             if os.path.isfile(output_filename):
+                 with open(output_filename, 'rb') as f:
+diff --git a/nbconvert/preprocessors/tests/test_svg2pdf.py b/nbconvert/preprocessors/tests/test_svg2pdf.py
+index c42222c7..d9ccec8c 100644
+--- a/nbconvert/preprocessors/tests/test_svg2pdf.py
++++ b/nbconvert/preprocessors/tests/test_svg2pdf.py
+@@ -4,6 +4,7 @@
+ # Distributed under the terms of the Modified BSD License.
+ 
+ from nbformat import v4 as nbformat
++from unittest.mock import patch, Mock
+ 
+ from .base import PreprocessorTestsBase
+ from ..svg2pdf import SVG2PDFPreprocessor
+@@ -51,9 +52,9 @@ class Testsvg2pdf(PreprocessorTestsBase):
+         return nbformat.new_notebook(cells=cells)
+ 
+ 
+-    def build_preprocessor(self):
++    def build_preprocessor(self, **kwargs):
+         """Make an instance of a preprocessor"""
+-        preprocessor = SVG2PDFPreprocessor()
++        preprocessor = SVG2PDFPreprocessor(**kwargs)
+         preprocessor.enabled = True
+         return preprocessor
+ 
+@@ -71,4 +72,23 @@ class Testsvg2pdf(PreprocessorTestsBase):
+         preprocessor = self.build_preprocessor()
+         nb, res = preprocessor(nb, res)
+         self.assertIn('application/pdf', nb.cells[0].outputs[0].data)
+-        
++
++    @patch('subprocess.Popen')
++    def test_inkscape_version_default(self, mock_popen):
++        mock_popen().communicate.return_value = (b'Inkscape 0.92.3 (2405546, 2018-03-11)', b'')
++        mock_popen().returncode = 0
++
++        preprocessor = self.build_preprocessor()
++        self.assertEquals(preprocessor.inkscape_version, '0.92.3')
++
++    def test_inkscape_pre_v1_command(self):
++        preprocessor = self.build_preprocessor(inkscape_version='0.92.3')
++        self.assertEquals(preprocessor.command, '0.92.3')
++
++    def test_inkscape_pre_v1_command(self):
++        preprocessor = self.build_preprocessor(inkscape='fake-inkscape', inkscape_version='0.92.3')
++        self.assertEquals(preprocessor.command, 'fake-inkscape --without-gui --export-pdf="{to_filename}" "{from_filename}"')
++
++    def test_inkscape_v1_command(self):
++        preprocessor = self.build_preprocessor(inkscape='fake-inkscape', inkscape_version='1.0beta2')
++        self.assertEquals(preprocessor.command, 'fake-inkscape --export-filename="{to_filename}" "{from_filename}"')
diff --git a/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch b/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch
new file mode 100644
index 000000000000..822c32753f83
--- /dev/null
+++ b/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch
@@ -0,0 +1,27 @@
+diff --git a/nbconvert/filters/strings.py b/nbconvert/filters/strings.py
+index 2673d661..9ae82a13 100755
+--- a/nbconvert/filters/strings.py
++++ b/nbconvert/filters/strings.py
+@@ -19,8 +19,8 @@ except ImportError:
+     from urllib2 import quote  # Py 2
+ 
+ # defusedxml does safe(r) parsing of untrusted XML data
+-from defusedxml import cElementTree as ElementTree
+-from xml.etree.cElementTree import Element
++from defusedxml import ElementTree
++from xml.etree.ElementTree import Element
+ 
+ from ipython_genutils import py3compat
+ 
+diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py
+index aff14d9f..b689b1bc 100644
+--- a/nbconvert/preprocessors/svg2pdf.py
++++ b/nbconvert/preprocessors/svg2pdf.py
+@@ -105,6 +105,6 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):
+             if os.path.isfile(output_filename):
+                 with open(output_filename, 'rb') as f:
+                     # PDF is a nb supported binary, data type, so base64 encode.
+-                    return base64.encodestring(f.read())
++                    return base64.encodebytes(f.read())
+             else:
+                 raise TypeError("Inkscape svg to pdf conversion failed")
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
index 71b87397b7e0..d47832d4ed86 100644
--- a/dev-python/nbconvert/metadata.xml
+++ b/dev-python/nbconvert/metadata.xml
@@ -5,10 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    Jupyter NBConvert converts Jupyter notebooks to various other
-    formats via Jinja templates.
-  </longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">nbconvert</remote-id>
     <remote-id type="github">jupyter/nbconvert</remote-id>
diff --git a/dev-python/nbconvert/nbconvert-5.6.1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1.ebuild
new file mode 100644
index 000000000000..594d35db111d
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-5.6.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+		media-gfx/inkscape
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-inkscape-1.patch
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+src_prepare() {
+	# assumes old inkscape output?
+	sed -i -e '/SVG\.ipynb/d' \
+		nbconvert/preprocessors/tests/test_execute.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	pytest -vv --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 66e76a982a6e..0289cfc4583e 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1,5 @@
 DIST nbformat-4.4.0.tar.gz 113683 BLAKE2B f86d85d4f8bd7b2253a958b7489f8a21efa439cd75373740b4aba215aaf2b63c32ebbc88541c9a7c57bb80ef00a996ba55313c3b830063305b9a9b41b713aef4 SHA512 46cb78bca374ef49c4461f230cbb8eb4af611d7be395a448680964c759d47fa8558dd07de96c43921ca171c486707dc823e278b724d9dab51bd30c3dab47ff6e
+DIST nbformat-5.0.7.gh.tar.gz 125328 BLAKE2B fa048ceef9d0612052dcf3180bca4228dba5117c6b0fb642f777bbd35e2b6f868454ae3d793aa0da3904757e42309ac53be19621a62967b719da86ab37d5f052 SHA512 3c1429a232d15d023f161f41cdab3364242f1a026349ea5aaeceba6a80afba981cc512a9f148ae3a0fa856a847c4560cc95abd965cc5d088a9f89c2b61d48fd1
 EBUILD nbformat-4.4.0-r1.ebuild 1244 BLAKE2B 05e194add2b79c08e6b6635de2f0dfb5aecbb3da1de181389d1427a704825fc564633fd5af2fa41a18e434f77b556e4e06fdfb49500f59479802fa9d350091ab SHA512 5b1f9548ef925c350dfc7502fba1487b0d0ebff2ce3a2ebf359313de78e8548594d6be59e49a68fec56b58b22cbd8965fee139e62b17f88940d36d224d2492f9
-MISC metadata.xml 647 BLAKE2B 0d115b188530f78f963105d8e9e4246328526a00146c79590a288f822a3326521950b0be1fdb348cacea47729c6600a99a82e57b02e191147cf0a05821187d26 SHA512 74b3a7a494e4ae1cd6407c031978a96d18de1e142570f5a42071df743bc55a8756271a3903f2bf22fe5997440339571c41a1210e7982bb1ad46468f84690a05f
+EBUILD nbformat-5.0.7.ebuild 801 BLAKE2B 2781bfb300d2ca1a73397a4af1cc01cc0aa6e16b17ac9e14d037cc56024954fa8bc71799fa9cb94cf2ffed4691796a094dc188d06b946aeea320c277dc36b40d SHA512 90517693fe5f401c7c45af8413877c24faf666d6c793e31eba8cd6c9d2c46c9c288a046296357c612a2c35815a2b20ab616d37250e98fa41f55c4fab70e731a2
+MISC metadata.xml 754 BLAKE2B 566e6a6a59e274323550624d9444267abb5279ef663328aa93906685a23bc7b38888468ccc3284889e3a1c6607cfeb501926ab6ac5ab84c5acd34fa62ead4205 SHA512 898ed2b6f39842e6a4624a0c7afeaa6480197637ee781001c093c21b807c094f5ec1cf436abde53b6d483abfe170c7b8720239b648499a697f0be140a0212be5
diff --git a/dev-python/nbformat/metadata.xml b/dev-python/nbformat/metadata.xml
index 81964b34d3ad..c43b5e4489c2 100644
--- a/dev-python/nbformat/metadata.xml
+++ b/dev-python/nbformat/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     Jupyther nbformat contains the reference implementation of the
     Jupyter Notebook format, and Python APIs for working with
diff --git a/dev-python/nbformat/nbformat-5.0.7.ebuild b/dev-python/nbformat/nbformat-5.0.7.ebuild
new file mode 100644
index 000000000000..23f19a3586f7
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="https://jupyter.org"
+# missing on pypi
+SRC_URI="
+	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc
+distutils_enable_tests pytest
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index a69fbca5ec68..f84fab810c8e 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,5 +1,7 @@
 DIST nbsphinx-0.2.14.tar.gz 98368 BLAKE2B 2ce32043fd3371d54b1922f973b9f8b4fc1bd1ace05fb2ee4136ed759454ebc5b3ac34030156d15a72d8e58bd739e7a4bc458e2cb26b8f80e9498df47c857a7a SHA512 263aaf8b466d83215251f6115fa6210bca69537d041336ec23d9caaad06653fe848914c2e01981461fbabb8f5e4881ca11a4a01aaccb07909de6b79e695602d6
 DIST nbsphinx-0.4.1.tar.gz 108928 BLAKE2B 449ba009003c1de52057d558039255f80efc2d6979926bbe8757faf21139bdf6f0e7e96280f63ffcc0436f45d83efeb525bca0139018f345025b8dd25202bc12 SHA512 5c37d8cb48c82aa9ae865a27650aaa037cde2c06140672ae1245fd3ceafa3d40b0ccbc37ac67bd1688b228107b97d84fb8eced783d71f79f8da7505883cf2617
+DIST nbsphinx-0.7.0.tar.gz 129485 BLAKE2B 0a11934cb53c5c20498abd1d189f26351ef088f7fd7972f7e1a4bd98e21ced330a600a2beb1a4976798e1ead1170f6322ff8b5f393c30cd85d33593720dcb57d SHA512 2c8db730102e483b76bf899bb5fc1e34bb4ed817a65fad221ccc5ea7dc74c2a4f4b69398d01209a904f503acc7fae2c29ad701e6cc11ac30bae3a7e9bdd89357
 EBUILD nbsphinx-0.2.14.ebuild 654 BLAKE2B 98f4dd4715a5a776cbe8a0b1067a8571e0ab3c2e5e4cfd000eeda249e28d5a0e0b129a2f3dc40ae4eaff4d7096f7d64cacbdaaf921403b718d354e7a3b91e6f0 SHA512 9e7a26f5c5c6e5f069507b1c6ef5c1eed9f395fd8f2a56271bc6a2e00d450400939ae89d7fed3cf2379c41e999b0c8148dfc45496e8568fe599c618f5fae9a61
 EBUILD nbsphinx-0.4.1.ebuild 656 BLAKE2B b8a9396284ecb1c9582d5098a3888f03c05cea445dbff6f7975e44e8afc44812d1af9276976f33511e00503850b746f9fe8528a66ea1b0507be46c878fbab494 SHA512 dcc6024e0a741dbbefb648c13796f03d1ed05cbb396c40f53f8e27d4c7bde38633d148bc6876f00263a010c94c50824848b3ad94e64acbae7df77dc4770f8be3
+EBUILD nbsphinx-0.7.0.ebuild 634 BLAKE2B 251979e490381548e16ee34c9e024d3d227aef3ecd20298e1d50c304effc0f2d8a8278be26e073de83d3540d25d5905c111b3d7a64c825ef983d6fc4e58d9ed4 SHA512 97540ffa327827e25bd4c38aed7f9224df33b631b5c6b545a10bd510a28a8180a83e76dbfc102be8db203c45563b173760a3368a08f9972c7511a0b958827954
 MISC metadata.xml 809 BLAKE2B 2724ffcef846efed97ee16e7395b3362596c46347fda07bb418469f3e39f06e0523177e7a8bee35cab7113de6380a1b7ca34a6b8bd108e765796fe12d4fcc478 SHA512 03c63397c153886e8ab60767ae510a4d17350a5a2b18c05ddbcc453ef81581a029c3c63fd7c82b109dcbe9a142ec32af1650b240c72d8f95097be326c39a7080
diff --git a/dev-python/nbsphinx/nbsphinx-0.7.0.ebuild b/dev-python/nbsphinx/nbsphinx-0.7.0.ebuild
new file mode 100644
index 000000000000..45662ca939f9
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+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"
+IUSE=""
+
+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/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 7b4f54553a3b..f90922c6d65f 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -3,5 +3,5 @@ DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e54
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
 EBUILD ndg-httpsclient-0.4.0.ebuild 786 BLAKE2B 6967c45cc141118acb98dfe34e4067553a0931b09fd35472c32aa5ec6dfa6ad5dfe132b1d565f1057f892791096dde0891414a467f90c35c86146f37ea23c6c9 SHA512 95faed72c02e8b2db8da43931b03aeacf217c358b9ca11c97d9f702ac097227eb9383db98c906c57b4de7b28043bec3e2c26f17666795584896ffed8469a463c
 EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1642 BLAKE2B 26b8fba6fc5fce373c2f9633d28f12bb2b74d6ec8bad90b497b675eb678440d408e9df97168bc3265c4d1783d9ea2337450ce5b606d1c471fd95e79359dc5100 SHA512 57d30e42f7892258da946454c3185f4ec0bca672a7fac4d0b5636892badaa95b005009fd8ef70aedfe082f655a0d39a5c50af0f328019efa1a3091df9db6dff9
-EBUILD ndg-httpsclient-0.5.1.ebuild 1268 BLAKE2B 5e490094ca16269041f3a8004ac9350511b92ee40a6554fb77b7f48cef330100c7dcd8323f27d6a21ba49b279a599278e32ade901de80d17db79b2c643c1d2be SHA512 a48e46c69688d995e690b488a41fbf50243cef3d4fe1531a9d95c46f519b1b10404eb6af5dadf65c10a0b6b65791a0806fd88b151566938b0d586716d3fc82bb
+EBUILD ndg-httpsclient-0.5.1.ebuild 1275 BLAKE2B 0e883c4e2f525084eb505074c57c28c739724168e11281e9d4d3883b56486238e88b589b17af87d2bb8228245960ee982a76076a6c17fae332cc18a0dd638ff9 SHA512 0e6fe2a145229b4b1d866d7293bb50dc1aaf00fd18a2b4c5fe2415a69b298978948022080d93eef48eecd4c0d24d6bfa6230cb86fc4fb6ee5fb97c35174df72b
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index a621ae646a1d..ad71ec5355d3 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index dbb3ff2da7f8..2aba5d369622 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,5 +1,5 @@
 DIST neutron-lib-1.29.2.tar.gz 455629 BLAKE2B 2969a7d844ec5a972bbd5cacc07d3fbeb59bb9a62bb98a94d6fa60dc1f0b7796499433fa54de80d96e2a467e3c022092e816e282e390febeabc8d87d1c13273f SHA512 9c3398e268be56864410fd7c71d796c3944f49c334faa1e7099fe768f1916b23b2b996d06c76c23b54a1889b605717091c787d345069cb51852f3f9cae636213
 DIST neutron-lib-2.3.0.tar.gz 444674 BLAKE2B f572c58f21034522ff0d30ebabadb19aa291ddb257757bcc25fbec24d46206ea9b44d36d547f454b43bc1fe611be4046fd186837e64b8cc54d681f301bc6494d SHA512 c2b0b36474d0a83c3720639b107100292dd65ad80986848b4c7a9e4304832ecae2342e451bcec68e21232901259d7b7d2a3a6f1b232d70014d262e6c7b594a80
 EBUILD neutron-lib-1.29.2.ebuild 1985 BLAKE2B 14e1044528257d70746e1f4c2d7890ded39c4e342979d59b5f3568da4eff211eee5e8aaa5fe99d0fece1228b957d9937e5c234aa64bb90b3b8da44bc2a46c26a SHA512 8fc3ef8b0a245e5b777d68e98396a6283090e307c223cedecf948d6d1ff64831219fa2ce39baf7987515731ffb113848ad4063750a28ce95ac8f1455c3254890
-EBUILD neutron-lib-2.3.0.ebuild 1940 BLAKE2B f5dcab75e765d5fdb163922b10aa534e24ec2f66c212590ebd1523c844d8d45a8af41373080a55e4ec4bf70289bb238a7789a0efdac235e701cb92aadcc7ee94 SHA512 d36671f4fe549541c3fa327e50c06f6b43d02f453d43a19f450efdc8cf5c1994c5deb038f128f54d89c5282157ace2533028b41545dca2934c85845434d0e80a
+EBUILD neutron-lib-2.3.0.ebuild 1938 BLAKE2B 783d99d9a8b53a142e7bf0f148e69248d5f5c8c048199fcaef308c911fb89b1d341c6921378d45b312ce8cdffbd064e66e68321079cce4a4a39547862982e330 SHA512 1af9fb0f697a07658cdae45082a31dcbbd087e389c6e4c8a5d328a283d70dfbd98aa3781d6a3de554ce45b5cc0da816ece80b2a869bfd56919a4c65fbeb224ac
 MISC metadata.xml 389 BLAKE2B 818db87a0d2106f73d59e638d0c5c94f382cc977fcb7e214e91de2073ba2b19017cef3ceaccd1b80e968ddd5bd0d8761092c1d5b31099810b5ac761c71a7413f SHA512 34c1660258f8aaf1ad5188e57f64de238b3c66a5de9e8ad1277d40397d0276a176240fc5b550294132c74a170e126ee08f3fc9931fee5f03023be1f1d9758343
diff --git a/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild b/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
index e9e0196c99e7..c043b621eb46 100644
--- a/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 34564b59c8d0..4800d353ae41 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,4 +1,3 @@
-AUX nltk-3.4.5-corpus-tests.patch 1625 BLAKE2B d070e7295ccdda93eae813de2ddd1c6ab3832722ddb815287cc1aa05ee5a3e6619be796d0dbc63a1c389a6f3a8b4eb9630564c2139bc636302d07c2212c446f1 SHA512 495179ae7ce022d1733508013d7a74c01f258a918047337b9d454bdc6f4a2b49a9fa2b77891a0af317ef6b1706802ab90e7c9bd2936fe5dc6f67371dd705c1f2
 DIST nltk-3.5.tar.gz 2805844 BLAKE2B d2494d831cf5503ac938b203e405ebae606166dbb907655113d3a5267bd54f03b6d8d5ac9e545fefd0b7855ce0c985064c9e746e402c540e19546e2d11ec151e SHA512 056ae219af607c158f1f2adc6fb9b4f402721778c13bf5ebc178deaf631142ad3e571d8b1fd96145067833cbeac4db25fc07c3fd032188c2d8ee7e5d7bd824f6
-EBUILD nltk-3.5.ebuild 1633 BLAKE2B 9df8ecea15fc2f23c410abe00b4e39f8e955da3c6fadde782d0070310c96397cf6e7eb03f338d8068dc64ad5b134e756beaf64e6efe96b49722cfa12d4377511 SHA512 4342c0bd53ad0af4ddab1c6c77812bb72d760fd7e98f496dc2d4337d1a1f36b8f44a097629f31b9de28dfcb71964d3b5951fd6ecfe4e86364dbdd345e3a5f9d2
+EBUILD nltk-3.5.ebuild 1670 BLAKE2B 4c6cc612fba517798f4a95d8b1b56c01911e331589cc9b16b368dfb4b690fc5cd41cb641f722b93e9c3e141acfb9dad15d1695b647e262704863a8d102ae3b24 SHA512 badaa18a4be51c9fdd398abdcc854c23d29af1a2816d1cb22123df6d1923c6b59645b86e2f2d096c949b95d6dc5a0c1e472a9f69c71459ae7ece004a1b0d52a3
 MISC metadata.xml 369 BLAKE2B 71cbdd71c636a0ad09350ff40d6f8852ccba6058d32b5ea7dfb2202d5909524fb78b4eff17b6af044ea65d67c67cb19cbc8fff1d20dcd9d4ed9906a0b5a49271 SHA512 7ee1d09e28699e68fc04a1ada4aa7fe091a1624cdf5e1be9568163829a0ae832bb26c58abb7509226c212f0d34d6ad549afb169a67167f1ae26b66ef431db65b
diff --git a/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch b/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
deleted file mode 100644
index 0284aec02b91..000000000000
--- a/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/nltk/test/corpus.doctest b/nltk/test/corpus.doctest
-index 5509fe2fd..0a34c9522 100644
---- a/nltk/test/corpus.doctest
-+++ b/nltk/test/corpus.doctest
-@@ -94,7 +94,7 @@ If the reader methods are called without any arguments, they will
- typically load all documents in the corpus.
- 
-     >>> len(inaugural.words())
--    145735
-+    149797
- 
- If a corpus contains a README file, it can be accessed with a ``readme()`` method:
- 
-@@ -387,8 +387,8 @@ examples illustrate the use of the wordlist corpora:
- 
-     >>> stopwords.fileids() # doctest: +ELLIPSIS
-     ['arabic', 'azerbaijani', 'danish', 'dutch', 'english', 'finnish', 'french', ...]
--    >>> stopwords.words('portuguese') # doctest: +ELLIPSIS
--    ['de', 'a', 'o', 'que', 'e', 'do', 'da', 'em', 'um', 'para', ...]
-+    >>> sorted(stopwords.words('portuguese')) # doctest: +ELLIPSIS
-+    ['a', 'ao', 'aos', 'aquela', 'aquelas', 'aquele', 'aqueles', ...]
-     >>> names.fileids()
-     ['female.txt', 'male.txt']
-     >>> names.words('male.txt') # doctest: +ELLIPSIS
-diff --git a/nltk/test/unit/test_wordnet.py b/nltk/test/unit/test_wordnet.py
-index a7b26ac91..a1df3d396 100644
---- a/nltk/test/unit/test_wordnet.py
-+++ b/nltk/test/unit/test_wordnet.py
-@@ -204,7 +204,7 @@ class WordnNetDemo(unittest.TestCase):
-             u'preobrat',
-             u'preobrat_v_mišljenju'
-             ]
--        self.assertEqual(S('about-face.n.02').lemma_names(lang='slv'), expected)
-+        self.assertEqual(sorted(S('about-face.n.02').lemma_names(lang='slv')), sorted(expected))
- 
-     def test_iterable_type_for_all_lemma_names(self):
-         # Duck-test for iterables.
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index ffb0ad46e42d..d127c3a08cfd 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -19,9 +19,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x8
 IUSE="tk"
 
 RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/joblib[${PYTHON_USEDEP}]
 	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nose-descriptionfixer/Manifest b/dev-python/nose-descriptionfixer/Manifest
deleted file mode 100644
index 4c2e3212e00f..000000000000
--- a/dev-python/nose-descriptionfixer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nose-descriptionfixer-0.0.4.tar.gz 2889 BLAKE2B 36ac9c0b3c5d12a713c609177dcdc8a46878ef367140417189a4cd1c88d58bb535838bbf181d469bdfc07a51cec9144cdcfdb9c1df749148228ad58ae688202f SHA512 c52e463282c1574ee35e96f680aeaebb6ec1b8ba1bfe58e387cf41d8708c60a7cb7501717de03a90f47db9c4b3aa3e5a4a57e4769d053fd4883e565369d8fce7
-EBUILD nose-descriptionfixer-0.0.4.ebuild 493 BLAKE2B 012b484091441353bdddb4aa763f9431d3faacc743a74716da5a70a61a75bc421d5c02a74ba6ebb9ab8dca48eb7f823537b43c5dbd1dfe66f5d2a9b38afc03c1 SHA512 cd117081ac41561ffeaf16db021e2733ba4610ce32751ea013aa3f6f2a465845b9075c407e1ae159c174b0917b6c235479ae94a82a4f7552da87b7464c8bb0c1
-MISC metadata.xml 345 BLAKE2B 29b06d919f4b25ba5f3a582d991a4c33baafbb1cbe9668b9ac2bb0933e1a1467e879b4e71ee080b955465a1bf0095f238f70c6b68b04ff9a5545f6547434f665 SHA512 9df2f1d74b7674acca3e4cbe6b48cb5b00c5a8405f81d3299e5f204fa00f03960fb1ebcf089792c619802c14ea3b9aea1fe33de817e4f791d8a035739309ee07
diff --git a/dev-python/nose-descriptionfixer/metadata.xml b/dev-python/nose-descriptionfixer/metadata.xml
deleted file mode 100644
index 28cdeeee5594..000000000000
--- a/dev-python/nose-descriptionfixer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>klausman@gentoo.org</email>
-    <name>Tobias Klausmann</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">nose-descriptionfixer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
deleted file mode 100644
index 6c586375e63a..000000000000
--- a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fix the way tests are described when the verbose flag is used"
-HOMEPAGE="https://pypi.org/project/nose-descriptionfixer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-random/Manifest b/dev-python/nose-random/Manifest
index c5d97d5d4928..da430832ca77 100644
--- a/dev-python/nose-random/Manifest
+++ b/dev-python/nose-random/Manifest
@@ -1,3 +1,3 @@
 DIST nose-random-1.0.0.tar.gz 3776 BLAKE2B 18dc40b13fcb970c4d2edeb6be9c6f3e710b36d14dcdc4a56c6e3ecf811ab2acd6be3e1c1cea2231eb5dc10581c77f201220354c77f3d9f67d89d894ed8b4f24 SHA512 9c62413fb00c3b774954ae7a65b08b122ae0dd2b24377efba8de345597b4ce4952aad09a0c2fea7f9d92f57a3664908fccd6eabadf32074a35978c958ea2b66f
-EBUILD nose-random-1.0.0.ebuild 498 BLAKE2B 5e24800b431e86c980b99f3ece5af4c8e4eb1755888a7a73df55bc33732677d032a1dd1556aaba48af2354e4fbf66f97d68abab3022c2b6fcb920b8848763785 SHA512 e94fbaa83f1dede642a02d11421d8f022f7112d2f9541c88897b202d5a9d610b95fb61a363d3b80a19ce390dc19f4ac5b64cf79739bf714a8016e9fd7f2cef56
+EBUILD nose-random-1.0.0.ebuild 497 BLAKE2B fe53a173a263425caf3119711a1170945cde05c1d86c75d011d2fe9c21ed93be10ba332af6be77de269cd1efbccfa60e9d08176d0765fe2a514569dd46626cca SHA512 8fc022257b97d0f965ee2925deadec97fe8a6b7a5c8e3b654345a5a83a0ce28004b8dd71ff692442eb0b770838063c14135933d4b8f1189cb11066f04f4ff159
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/nose-random/nose-random-1.0.0.ebuild b/dev-python/nose-random/nose-random-1.0.0.ebuild
index c4a593c95802..973cf59a42b7 100644
--- a/dev-python/nose-random/nose-random-1.0.0.ebuild
+++ b/dev-python/nose-random/nose-random-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index a884bfd2d752..65246278289b 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r3.ebuild 848 BLAKE2B d9eea1156f29676685023dbe02c5f7178121ba66f565f6af9e83411aa892d3412b73d5048d142bbb59b22d09531ffc8d7e434250a803aa941877efb0b2eb31ba SHA512 d3620bb13881a0eb677fb6b9883a310850b1c4df0bbc53398ae8e224f2fc222bbfb08feac53eb5e1f785ea52db1ffd9fa78f5971a9030c0103bddf0ace69be18
+EBUILD nose_warnings_filters-0.1.5-r3.ebuild 517 BLAKE2B 7b2ef60aba5937c54c6138f7b28acd9a7768770f8bfcf91705c1bc4f6a0482051a73f50f156954900841e551a19988bc68162224a3faf7c198c76e0a15806c08 SHA512 4e0aea11dbb3e83ff200f957904d0da55c321e13a461de481f789140099a6e399707b36aa4ad257f81b5961c8c59ee8a8087770971aa03b659ee3941d1fd783d
 MISC metadata.xml 393 BLAKE2B 077fd1e2172a4fbf35315d6597ead3dcf760145272ed4855df1b8cfd484addeffbba47bb7334c9fef8b404b70f3a136d8687d270dc22607306b68a79fbeb764e SHA512 5a579ee892244135abe424c05a9ed28ccc0d04e2e0dc87cc14187de9b5f86e00f8c51a762c0a55333f92370df2e982cf82babee6dec27205f15ede1aa87bde11
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
index 3f1dac54216b..e54eb5690252 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,19 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
 
-python_test() {
-	# nose_warnings_filters doesn't have a proper
-	# testing suite, hence we run the only testing
-	# script available
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	"${EPYTHON}" "${S}"/${PN}/testing/test_config.py || die "Failed running test script"
-}
+distutils_enable_tests nose
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 5222e1e7ba62..e649199ecddd 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -2,10 +2,13 @@ AUX notebook-5.0.0-example-execution.patch 941 BLAKE2B 6df33095a99042a5345dc3b75
 AUX notebook-5.0.0-setupbase.py.patch 1368 BLAKE2B 7c80334d515becf41d881a1d4b3820a263c8cac2913dd9ef4df149bcd85ee7a09df6ba91e607f15ac35dde1a504e89775dec93043bfcdc7700643b645c986929 SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96
 AUX notebook-5.2.1-setupbase.py.patch 1407 BLAKE2B 0c7a0872f62df6c3e77aacdcb3736c09441479de127eb228fc8d65828a16656f37c4742c6101de841326a24c62bd4a4c76cf8d31f9dbfe61bc4249ecdaf55582 SHA512 6a01feb531b4594bbc0520c80dce53da66fbad3cfb3fce22c2b20e5d6652b8691581fe6a321ac5771b47ee1530bd27b0fac3fda55ab15573037379b84362bf67
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
+AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353b0848b783e786b02549975a56e122ba85dec7ad9dae3963a80c34e8c22c1d8c95b054077cd397607db0c9c15329 SHA512 8e0d0851156935fab5b47fcf13fe0a92f6675914b9c3fac1a36c28e282b4003501572dcddac4d729ba798609c7c49b8241ac72277491907adbeb52b2dd14041f
 DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
 DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
 DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a541186522402084dfa55e335163fee30e68476265e9825c3623408989b1a0782ff6a5af71af4d8ea5e6e308c3a45 SHA512 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07
-EBUILD notebook-5.0.0.ebuild 2211 BLAKE2B dec5d31a5630cf4656ebfcaa842995c5b13ca57de3da9984653675283b2d3989ff5bca3aae39718ded005b1af60c080e6478a238bd3f69b670565585d7773f46 SHA512 8549fab9903c51a58b0f35b9cc32bfcfe03404a940cf9da7bae50dcf7f0e40559b3a522882a538a8ef4e8705bb407af75eef17992f3e0ff9c21efe17a3e165bf
-EBUILD notebook-5.2.1.ebuild 2516 BLAKE2B b429e5ee472f5295796c4f84cae8c20de9979ab26d362cd2cff2fdc1564742f8ef227e4a2cdb0db920799230aba9f3154950e50d2cdc1293f480b1d4f89115e6 SHA512 f14bf9da66ba0c8ad00ed722d3c74bc1c6420fc7af2e83e356289259c9990f7fd3794eadfab621a6c701c2d283585b78f1b6e823c96aac68bfb54922150aa352
-EBUILD notebook-5.7.8.ebuild 3000 BLAKE2B 05a81e32db189363b7d3e4ef35c61abb90a9ce8c0515987777503076e9528c78f5f32dc6cef5fc27b55a331ae6e72d577453c9f484742bcdf498d6da57c8e05a SHA512 b40b4be6710f29b82dd8968040f5d2932494e426af903e8418500e8e3bb844601c32727a750ad518ea7f52cc2fd211900fb58b7a5d42378c585002381f839b52
+DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
+EBUILD notebook-5.0.0.ebuild 2212 BLAKE2B 084e83dc0e77c008455afba813e376996fec0b22225c7a0b1e444f90e47922c0401fdfd16829e662d15e066f023239ba768a5c5f74284cbf5d21f7b06ca225a6 SHA512 3c8fcd5f09eea10d10e8726e7c60fb2dc69b6d1da393ea972318202f991e47fd92a4bf2f5e0e0312225670b494e219b269919cb9ec9aa173caa6df4632097cef
+EBUILD notebook-5.2.1.ebuild 2481 BLAKE2B 82733e9825422222c2ea37146741ec5d510d7bddba8f331a074eb5ff8893be9e2b25cae279e519a43205997b1f2ea4a549baaac42b36d74060602241795c9fe4 SHA512 7ae45ff9d12cac19894432e8dbd0ec1fbdfc818bb76bbdf67cf91c8b19d1c79acf0bfebfce550b634529974201ce214db52018851838b47e8ba650cb48c157bc
+EBUILD notebook-5.7.8.ebuild 2965 BLAKE2B b2cec1042caa14371ffb788d8380410131b11d4d6d62a2f248011227edeb741444db7c2fee142c2800f858e15e75cd035e4072fda9f67ca3e03d337bdc1d164f SHA512 514a170ce702ae495a6f0aff2b0c1d8aa467d00f7af69d27a54c891139d9ee258ab106ba99c4b3a6ae4afcd7dde677ef7e8f6289cfd576dc0c0ec94284cca1eb
+EBUILD notebook-6.0.3.ebuild 2371 BLAKE2B 72a81edb848bc1623ba651aae700e751c439abb3c079ef33e843972817e86af2e897adcbf0dc221726b86a1166c31d79fc8dd6925eb14b268e62fac5b879aa62 SHA512 856dfb48af215bbd61ed8aa757de218639d327e87a3147649a3d374f6fd4363c6ff07d54f7480111aa154a556ea08cbc0fc97dc0d044cd1ad5c58b0da3b53c7c
 MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/files/notebook-6.0.3-py39.patch b/dev-python/notebook/files/notebook-6.0.3-py39.patch
new file mode 100644
index 000000000000..2b0fc134b58a
--- /dev/null
+++ b/dev-python/notebook/files/notebook-6.0.3-py39.patch
@@ -0,0 +1,73 @@
+From c01b2cc014af5c3f8c1e00907a985edc19cad8d7 Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Wed, 22 Jan 2020 00:41:58 +0530
+Subject: [PATCH] Remove deprecated encoding parameter for Python 3.9
+ compatibility.
+
+---
+ notebook/tests/test_gateway.py | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/notebook/tests/test_gateway.py b/notebook/tests/test_gateway.py
+index d0cc84b09d..116b3db673 100644
+--- a/notebook/tests/test_gateway.py
++++ b/notebook/tests/test_gateway.py
+@@ -176,7 +176,7 @@ def test_gateway_get_kernelspecs(self):
+         with mocked_gateway:
+             response = self.request('GET', '/api/kernelspecs')
+             self.assertEqual(response.status_code, 200)
+-            content = json.loads(response.content.decode('utf-8'), encoding='utf-8')
++            content = json.loads(response.content.decode('utf-8'))
+             kspecs = content.get('kernelspecs')
+             self.assertEqual(len(kspecs), 2)
+             self.assertEqual(kspecs.get('kspec_bar').get('name'), 'kspec_bar')
+@@ -186,7 +186,7 @@ def test_gateway_get_named_kernelspec(self):
+         with mocked_gateway:
+             response = self.request('GET', '/api/kernelspecs/kspec_foo')
+             self.assertEqual(response.status_code, 200)
+-            kspec_foo = json.loads(response.content.decode('utf-8'), encoding='utf-8')
++            kspec_foo = json.loads(response.content.decode('utf-8'))
+             self.assertEqual(kspec_foo.get('name'), 'kspec_foo')
+ 
+             response = self.request('GET', '/api/kernelspecs/no_such_spec')
+@@ -257,7 +257,7 @@ def create_session(self, kernel_name):
+             # Create the kernel... (also tests get_kernel)
+             response = self.request('POST', '/api/sessions', **kwargs)
+             self.assertEqual(response.status_code, 201)
+-            model = json.loads(response.content.decode('utf-8'), encoding='utf-8')
++            model = json.loads(response.content.decode('utf-8'))
+             self.assertEqual(model.get('path'), nb_path)
+             kernel_id = model.get('kernel').get('id')
+             # ensure its in the running_kernels and name matches.
+@@ -286,7 +286,7 @@ def is_kernel_running(self, kernel_id):
+             # Get list of running kernels
+             response = self.request('GET', '/api/kernels')
+             self.assertEqual(response.status_code, 200)
+-            kernels = json.loads(response.content.decode('utf-8'), encoding='utf-8')
++            kernels = json.loads(response.content.decode('utf-8'))
+             self.assertEqual(len(kernels), len(running_kernels))
+             for model in kernels:
+                 if model.get('id') == kernel_id:
+@@ -305,7 +305,7 @@ def create_kernel(self, kernel_name):
+ 
+             response = self.request('POST', '/api/kernels', **kwargs)
+             self.assertEqual(response.status_code, 201)
+-            model = json.loads(response.content.decode('utf-8'), encoding='utf-8')
++            model = json.loads(response.content.decode('utf-8'))
+             kernel_id = model.get('id')
+             # ensure its in the running_kernels and name matches.
+             running_kernel = running_kernels.get(kernel_id)
+@@ -330,7 +330,7 @@ def restart_kernel(self, kernel_id):
+         with mocked_gateway:
+             response = self.request('POST', '/api/kernels/' + kernel_id + '/restart')
+             self.assertEqual(response.status_code, 200)
+-            model = json.loads(response.content.decode('utf-8'), encoding='utf-8')
++            model = json.loads(response.content.decode('utf-8'))
+             restarted_kernel_id = model.get('id')
+             # ensure its in the running_kernels and name matches.
+             running_kernel = running_kernels.get(restarted_kernel_id)
+@@ -345,4 +345,3 @@ def delete_kernel(self, kernel_id):
+             response = self.request('DELETE', '/api/kernels/' + kernel_id)
+             self.assertEqual(response.status_code, 204)
+             self.assertEqual(response.reason, 'No Content')
+-
diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index d58a631f686d..d4c0e2123f49 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/notebook/notebook-5.2.1.ebuild b/dev-python/notebook/notebook-5.2.1.ebuild
index 33f68859535e..3faa47b3b2ee 100644
--- a/dev-python/notebook/notebook-5.2.1.ebuild
+++ b/dev-python/notebook/notebook-5.2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -53,9 +53,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch )
 
-# Opens a qtconsole
-restrict="doc"
-
 python_prepare_all() {
 	sed \
 		-e "/import setup/s:$:\nimport setuptools:g" \
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index ed340b66e0a0..4c9dc036bc2d 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -60,9 +60,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch )
 
-# Opens a qtconsole
-restrict="doc"
-
 python_prepare_all() {
 	sed \
 		-e "/import setup/s:$:\nimport setuptools:g" \
diff --git a/dev-python/notebook/notebook-6.0.3.ebuild b/dev-python/notebook/notebook-6.0.3.ebuild
new file mode 100644
index 000000000000..a92fb17d8b10
--- /dev/null
+++ b/dev-python/notebook/notebook-6.0.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# require geckodriver
+	rm -r notebook/tests/selenium || die
+	# trash doesn't seem to work for us
+	sed -e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_manager.py || die
+	sed -e 's:test_checkpoints_follow_file:_&:' \
+		-e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_contents_api.py || die
+	# TODO: high magic, SRE module mismatch
+	sed -e 's:test_connections:_&:' \
+		-e 's:test_main_kernel_handler:_&:' \
+		-i notebook/services/kernels/tests/test_kernels_api.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notify-python/Manifest b/dev-python/notify-python/Manifest
index 8b1d79a939af..65ebf6edbf33 100644
--- a/dev-python/notify-python/Manifest
+++ b/dev-python/notify-python/Manifest
@@ -1,4 +1,4 @@
 AUX notify-python-0.1.1-libnotify-0.7.patch 916 BLAKE2B 22fbcd4a8c1931fe78a342d5d82df71664f803d6eb935003c0f0e46bc7f562b10b038983744ba16b883db72895ad7f1ef57d9fadb3c9c6f93219b94aa47ce89e SHA512 1b8c1e315ecd842925335d2115a941df47569a9557e79eca734a051e838418d0fe0d315e4f8b41de219662271dbb6e1faa8398374d1728e92263c84feb0ccc66
 DIST notify-python-0.1.1.tar.bz2 214514 BLAKE2B 7e7496b817abedc5577751a6525ca928c6f7e8cc51aeac810a0927e46533d93d4da73b5f76846a68cde025dae24000601a5745eb93037b149177d4941cbdaffc SHA512 67021af81d77b6a1ead4ee2a0ab4e8684c2b60c672ab7aa09a8f89d71cf646453d9be76455ac28616d70645019946db1731a7021fbb91fe66d9e057fcb3815a0
-EBUILD notify-python-0.1.1-r3.ebuild 1286 BLAKE2B 7357f250eb3cfa6fedf33a6e900734755cb359d541e64134f1f648cebc5758f21cede5afe8aa6b6f1c8b153a5e3948c7f49529e0d7ae60eb5670f45d3ee18c5f SHA512 a6890c0e5e0eee213cf008d6bdb9918d67c30ab7e4cac73c0ac14a39f0be5633e7855bf32b8847b2c7d7ffd91ad3fde38d6b181df493dde51cf00840a4b07945
+EBUILD notify-python-0.1.1-r3.ebuild 1287 BLAKE2B 16b5eb25c518deeed1ffc04a6e6b06e92d9a05de0d448f1546806437475b5fe7ab9ed2184e483900b68f9207cf059aab459de3bae29f7cf90de88e12e630e896 SHA512 f5831e1b93a7463abc2f3939854647eead1b4ebcfc8c79e951dc14fb9a673064b971af3be27c53fc2193af0b18f592886a92fcf6753d998630ace4d2715dadd7
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
index 28b3cacc1f09..733747a4582b 100644
--- a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
+++ b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index d73a08886ac3..488f6ecc1183 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,3 @@
 DIST nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz 9703187 BLAKE2B 9767b79514b8d7da8cac879c71fa76054993d17bee41f978ccca1648bed525567cfec48bfe06ae2b1de2146d2c2898afd4e53b746d5b03c0e48e6c93632407e6 SHA512 6888b00a11fb7d54947c438ba9e654f97e4ccd1ba292ad6219c7a2f4cc56fc75d249b89eb688b2f99ea3f321472eeb5103b33f4641d17e9983c70e9ad3cf6cb3
-EBUILD nototools-0_pre20200207.ebuild 946 BLAKE2B 1e7492505c494c9bfc16cf0e2edbe281e54ce2472a0dd0a36b3e2038fcf49f0716ba28bd34e535b0a2ad8294b1c358007f76be84447710822f30fb33c63d512c SHA512 c26e89e3d74dfdeb53b343d4b91c6b14f4599ea7b705aed5d362810e590a320848a34f92a5e88eeaf96bc059bdc2455b463ebc58a91c6033107a3255b447ed9c
+EBUILD nototools-0_pre20200207.ebuild 965 BLAKE2B 28e39eee5f7c040618a90a64da3dcc1b23995b8466316db7ed143b2af9627f772838a236fa2ab4636773c34a758debba854373ee4f9080e677a83a5352805b69 SHA512 65f4a585c531756e57d685e74ba791901d2d431f4027ab7dd0d2f8c229185556fc492aa4d08a9e884fc33f2774f83ad4136e4011a666a46a188d7077a110b075
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-0_pre20200207.ebuild b/dev-python/nototools/nototools-0_pre20200207.ebuild
index 95abe33d4b68..2546deda4b2a 100644
--- a/dev-python/nototools/nototools-0_pre20200207.ebuild
+++ b/dev-python/nototools/nototools-0_pre20200207.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/notot
 
 LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	media-gfx/scour
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 1efdd86a5eb4..235bd9e00cc0 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,5 @@
 DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
+DIST numexpr-2.7.1.tar.gz 99196 BLAKE2B 14912a0a50a46c085215f0a40467371859aedeaaf999f747d735df4c244529709b26c1257d3c5c05ed0ceea801d117bf6a330dbd30573fe274522e1101e2f4b3 SHA512 e8852ed1c7bd7f7e94ce5ad78de7a8a7ca30a5873dbfa4fae0a179fbcf956b1e66f2a09c1785f0d8d9e83a5cba359a55840a21784bc225aa01915a322709d370
 EBUILD numexpr-2.6.9.ebuild 1384 BLAKE2B 1079484cc597630dc930b9d9e497bef95903cbb8284ef5aca62a1ef95f452f3bda92fcf9ecece5eb00e53e5197dbf43e6ee5b3fbb37942454ceb27eb3b4cd343 SHA512 f57becdfa8847a6752dc1194d4157fb3f9eabd8375260a73de18a2f9af889a42542c53b95089b8b95eb7d4c9e94675f4cefa1d3f82f49ce0abfecea0e5b7dc25
+EBUILD numexpr-2.7.1.ebuild 1389 BLAKE2B ec2700682d0d4543d6c251436e93d17d922fa303888e22d24e30700d9c2c245e91f3dfe8371389a6c89d8b88b9504052d491f8019bad1c6185c3132c8d9b2bfe SHA512 fa0060822e1eec5609c171bd5b46dbd4aabbbb8a1701dc6e5ae837638e97d94d3c33f16c2f18ab26c4750ab30a62c137c35f5ca801cf366b762837c9a18a75ad
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.1.ebuild b/dev-python/numexpr/numexpr-2.7.1.ebuild
new file mode 100644
index 000000000000..138fd440b66e
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.7.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys,numexpr;sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest
index cff7d757f0cd..83b805005da9 100644
--- a/dev-python/numpy-python2/Manifest
+++ b/dev-python/numpy-python2/Manifest
@@ -4,5 +4,5 @@ DIST numpy-1.16.6.zip 5143340 BLAKE2B 2c31473551aaf00e7d3175ce37463ce0f14ff3e77b
 DIST numpy-html-1.16.6.zip 12190671 BLAKE2B c24586a40bb05fdb2f2f092778e01f7c60b17d2c695d0fb8577e988778ad80b711edf7e067a20c699946344a50febc152ab586f4653b80bcbeb489650dafbd1b SHA512 ad25e7b91b992af78a6748f12d6fcbe153d96cb8667d5dc4a6b6b2a6105e24a11c32cbf63dd3314ed4aa9b65a55ec5b3a51cd7763af5dfdd133510ddd6e4ed16
 DIST numpy-ref-1.16.6.pdf 5183393 BLAKE2B e92a8a7a32ab45d2fdfd6760e62d8d9b5b3f89e202a29e18ef1b6ce49ec56bbfea0e48e0c47b4c35cad02783fa1db33726a0f4fed4a50b0d8ed84babced8b79e SHA512 66dbb684f4140874d19826b479c781e16e7992a7cec46137f785f9a8fa071911966fbb3932cbcdcd040bbb5fbefac8c96d511ef623a57fc268aac9331aae8d22
 DIST numpy-user-1.16.6.pdf 621980 BLAKE2B ec735ff7057935d3a7f33f291792b74618f5dc10ee091c434f49c77e58f683821af9cce46286564ac9b8cb0111498f9d1b657d0c343e0a4313c3f895982dca8b SHA512 ff03719c91707a39b4bc388558838f72d4412f34dd0b07f2a0b2cf8fedac6811e8789985013cf1f23c7a650f115655f71e9cadc51ef4e7ae6e49d7552752409a
-EBUILD numpy-python2-1.16.6.ebuild 4546 BLAKE2B f75598df8e832d523682d14a63247bf66335054b6cf3761cdfb86f1ee783df17e844e5169d8e8cc310a7fd1aba30009e43e17d33f7311fab17a12b3428257954 SHA512 71046ffd8c95ab6f3868152d19a41d8044ec2b8da469de51986a0174809d2d35481fa097d40f2ff27bd4e36c4c6ab29addf676a9c231e6bcc2f42ceace8d8011
+EBUILD numpy-python2-1.16.6.ebuild 4544 BLAKE2B 73d2aad4b4bcc88287eb7c6f285d1e046ec8ef6eab83a51760ce27a617743c8fcfe8260b3496d045ecc6f74bee2c25c369463a49b4fdaa74fd8713019bf3ea61 SHA512 0fbfeaaa16ac3a552186f3cca77798694a40822c2a6ba6f2fdc3823042e6ad0d6c18ee1408c358f287ec4bc8c56016dcdc29602a045cf18f8b57b3bd9c54c18a
 MISC metadata.xml 366 BLAKE2B e9091f018d33b7d7addac725b90adfd9007e90144f7cdaac94b25e4783e6c11c33d754f8edb8932d7f6ffce0e0371b1711abc7d8ec91117a1fe6b64067c29517 SHA512 3bcabbfdd7196ad70ff9c4ae84f3a6b46b14457140e5b7d72c0b1dda202ddc2a77773dad81eafeeee5228298342c04c8f1f36c421802214ee1f62e6cad9b1222
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
index 082803a63d19..4fd160747814 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 3e124b7f55f8..c3ef530b861a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -4,10 +4,12 @@ AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67
 DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f SHA512 f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
 DIST numpy-1.18.3.zip 5435268 BLAKE2B aaf14627ca24e27806e6a5498a8b91f85c2582794db2ef2ec315e88b107435aeb2e8f288c68ba00593150787d6deb887faa029f850df4c6cb65426499f7ee83f SHA512 afb14dec81ade556e10b7de372e9d7b01b4bf246609c5eea26ad76ce93e6d9caa95479ae70dbfb725f28ac4802f94203c92e1e991852d2866b5225fc9d68e68d
+DIST numpy-1.18.5.zip 5441636 BLAKE2B d11bbf3c38a4194942d024ef82d63aa80a3d9044480a54e1b25d57b26f4dd7936b8ddd9c8b2636e307392c96fc51cb687e7a0e32ea7df9c85d46d80be45bdb46 SHA512 ea1896535016d3b207152c503005bf82095cc82c263f7f32ea75ce2d9394724f9700cf2265f9fb1f38169c37a0fe63ef97e88f84637f11758c52c624eec3d141
 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.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73
-EBUILD numpy-1.17.4-r3.ebuild 3694 BLAKE2B 0c614d42c0a67922d882eddde2cd97de9d3d24c72d8a344ec6690afffa5e1f47962a2762fa49e38d54bd0d64f003ead03d2e4c0dfac4e0892745751add5f921e SHA512 41b898ba6c4eebd1c9382e2bc392e04a3e0d56e6c5ab3707d7a252e02d45f05f54de6569da9f6f425b9874d3082a020cb7a2171500e3c6f53559a90b36cf6b7b
-EBUILD numpy-1.18.3.ebuild 3735 BLAKE2B 6442e75f8f8c4cef1c9a2fc06edd5cdbc71327c6f7952c90b4a0d3b34ba541571fe706a043f2c9617c69ef2babfc32b08b2b50675eced5358bb3a428727056a1 SHA512 efdd2f3b0435e5411c232159ae2975ef0d41c182bdda2833f633f6410d83bf8e456fc5c0cd06cbe211e61c67daf9911ce37b0d6d8d0189804cb3016527d7ad0c
+EBUILD numpy-1.17.4-r3.ebuild 3692 BLAKE2B 3066645644584c6cdeaeddb84da1ea811300e8f7df77efc643e39461253451fb3008d9194998db83f13648e1e79a6b06c85bc063678a1b76b1c3acf051583502 SHA512 622b8faddb286e75b85ca73cad6946ca6fc2fcf78f38bc38095ca0a0e038cdabe104681b51e093f6b1ed27602d5088b2f036494c217045368a0e3bd0ca7156ce
+EBUILD numpy-1.18.3.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
+EBUILD numpy-1.18.5.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.17.4-r3.ebuild b/dev-python/numpy/numpy-1.17.4-r3.ebuild
index c785601b1c78..6c64e49ccdba 100644
--- a/dev-python/numpy/numpy-1.17.4-r3.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/numpy-1.18.3.ebuild b/dev-python/numpy/numpy-1.18.3.ebuild
index 05e59611dcc7..eb27fd1bee00 100644
--- a/dev-python/numpy/numpy-1.18.3.ebuild
+++ b/dev-python/numpy/numpy-1.18.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.18.5.ebuild b/dev-python/numpy/numpy-1.18.5.ebuild
new file mode 100644
index 000000000000..eb27fd1bee00
--- /dev/null
+++ b/dev-python/numpy/numpy-1.18.5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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://www.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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.15[${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/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 96810c495ab6..39898e0b0ab4 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,5 +1,5 @@
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
 DIST numpydoc-0.9.2.tar.gz 27555 BLAKE2B 47b7788c502a26c40889c84563c0b94983655a653fa1f783f47d667021c65c7ffc0d2cdd14a16dfcb982da48642c0b07c949f57336d5b67c897a78815684bcac SHA512 db8f5c3b409ece0a40f1c2ccb06eaa182896d173a5c913c7e6c5780fd021d746c48557fee6f050db8c42cfa41a5021901342bbb93dfd8b8daf7d43fead9cf94a
 EBUILD numpydoc-0.9.1.ebuild 782 BLAKE2B 8c0c94fdaac4280ce66502dcdc254de03a8d33384586be2efa249728c93bae31a655f90869d33ee518ae8bf9edb97b56de4785ece4d076caea896efa6bfcfe03 SHA512 4bd71ffd4a8fdc1b61e853d39773cf1500933df899abdebb9fe4cc57bdbbda91e7f917038caf548abd9710bb58e6f3499e3db62fa54eaa0681fde58ed4483010
-EBUILD numpydoc-0.9.2.ebuild 582 BLAKE2B c36da7769c49beb57c083328cbca4b80f6e936b3b956f86f5f57264f051d72b53a78d8a87109a35fce807a0a2b92fa96a041ba686c5c4a0144c93b8b483cb332 SHA512 69d82bd63b2216e34a6846bef5ec381d6fec947bffa63cd2a04f46a0ea5e57c877ad94e663f95e674c22d0c13a5dcbdbe3cadec02ecba916cb9ed2b800690e61
+EBUILD numpydoc-0.9.2.ebuild 598 BLAKE2B 37a54df7e8838af8bfaea968cb0953aaaa923d6a4ccc3bbefbb389953d11856decb7c6615386c1e36f8cbe2f3caea5461313ba88b80e6a12f7083e7c7346705e SHA512 793fc4c9ceff3b528a82ef09f1949d337e87ee7627a58e90d649d11dc53cf684e2fccef501603ebc0c82ac530e0dcb527941f918b81257f555179cfd777bb05c
 MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
diff --git a/dev-python/numpydoc/numpydoc-0.9.2.ebuild b/dev-python/numpydoc/numpydoc-0.9.2.ebuild
index 5882f6b8eb06..f1101578b636 100644
--- a/dev-python/numpydoc/numpydoc-0.9.2.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 6b54efe01b03..6d7e8a57477d 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -2,5 +2,5 @@ AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bc
 DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
 DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
 EBUILD objgraph-3.4.0.ebuild 658 BLAKE2B 1a70a174cdc6d7b43860e3006d136b8d912c9a98244b492ef1372589c7951fa01e5953d1833e0fdeadd81bf1a64a529897d56582919634d33b58ccd373f306d7 SHA512 6209380e4e502984ab691bd2525f1eb89f7b44dccd9e7a84a99c5814b8e011c0937d14b5e405b9f42d112a50650f4714eba0d69de3def539460f3a29229e0da5
-EBUILD objgraph-3.4.1.ebuild 726 BLAKE2B f3aafbcbc5650f6a161c47eef6a7e2d5a3d683bcc0b5ae8d0ffdea81c9a4f89feae102b4b2c84c0b55b7fba106efcda019a467d6767c7a9b0c6c37a1cc746492 SHA512 7af8a1c9204c256e1dda56970ac4a498bdb651f95b5c361eff099646ebf124cfa2fefb368b7c24c29393badf37be6dafd6d19886d8aff639efb797c5be83fa60
+EBUILD objgraph-3.4.1.ebuild 742 BLAKE2B 50ae601cf65234dfcbe3eafa1b406528fa7c3044d907af3f1603a30e31158047cb1fa64f0684d7edbdd3eca397082e10cf56ac544236289f82f15bb03aabac83 SHA512 0a76a415c2430a083e8a3193aa8b7a1a2f2a6282863577e5ee9338dd8d97a48cbcca5d13840feed8b37f739597a3ba6dd5319f28a2b2397c16d46e3e11621925
 MISC metadata.xml 323 BLAKE2B 61446164eeea15b99f003a44e0b0c3eedf83a0797401922efc0d6509c86446823201e9c7b91a11264f852ce0a56a2d6d5d5b27fe9d2205a4276c2cce5a312625 SHA512 94389cd95cc8aab6c1acd18c2135eac25566894f9d793ab8dc2af68789ee464dde409350bd4dbe9fd9a87c7f81e45723331948a7d9cfc792dfa51cb86e74ccc9
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index bff9f31f2e5d..2df7123cb5fe 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 9b1252525308..307b334a4823 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.46.ebuild 554 BLAKE2B 42a2d92ddf625d158ae07f7c442bf1a3de587f9aaf03a269c48cd8186f464319534d325b17dfd5b7b5621bbd60f479605c78e4c0a824f8fd8eed53071e779328 SHA512 04ee955a17718bc449c6918d1b0b5154142498b98703832606bf0a98a4be129f4b20a79324139ea00e97f017e83efe5657a5367c5e96499ee03d7cbfb654c2e8
+EBUILD olefile-0.46.ebuild 553 BLAKE2B c01da87800cddcd32de90f0ad84e451a4e090bc3c600370b1c02fec0868f74b89d69b1fb41b120b66b05f04d62459a54c7d48dd68b330684da74a70552fc819d SHA512 c245fade510e2fccf67710dd0e1fa2416670a53490f352b643dc8fa6b4a6c90fbb4db452fb8ed36857394e550ab8613b75079e948bd032aee309b10cfc2760b0
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index b5bd63783cd0..7631f5395f7c 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 1d11dae4a5d8..33aa794c4899 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,4 +1,6 @@
 DIST openpyxl-3.0.0.tar.bz2 2405154 BLAKE2B d14e529c73cebd3eab6a4d93dc38c1807d38a5396032b4df77bc7af5d98b5b68369f1b44cce83d77592e7aca673ca497d49a1fafc1f0bcca3c0aff19486ea8db SHA512 fc0c31b1ae486f6fc8802dbd6ea2efee65e788b452240985202617109113dfccb5b26bfa94c2ac42a0ac218ff75bc310773f96122da1522537c063e8d55309f4
+DIST openpyxl-3.0.3.tar.bz2 2407120 BLAKE2B 8a746409d3424014150bad797923f076ac8ba0ab24ffe0ee75c1d65f02accbeecfdc0ae5d2c6025d0fa937cf0f1c75c8837a84ba0f9d63b3778c14c2899df4ba SHA512 7a17a21a4f3be391e7ab72ef6c5f6342094404f68a9e9ca69f874f1ac2441d81699b91224cd1ccd4fe3e7e5c99ca59088ee532bbd2e6edcab40c27a8f1898095
 EBUILD openpyxl-3.0.0.ebuild 980 BLAKE2B fa7daeaf8a65bce12b3c09927e06007cd0ac54dfe6e8d93590e6f73a176bd73d5d4330c0d3eaf42fb60da9e2c59fd1905a8643fc33669a234ecbde0f9a239615 SHA512 de96ccce27cc480a482c5f330786ca0943359c21937f39c0f7b30e572fd8dfcfa31c29a74118786bc89576ebeb0c54bf3f379dfa94797cbea24739afba6aaf64
+EBUILD openpyxl-3.0.3.ebuild 804 BLAKE2B adb26f9f521ba77248725e7a4fb791372dfa1e69b2bd84212ab021871d6ddb957af879c004663dc28d2fdb9b48b9c8a83f19f3b82f3178e09a3ab43a0502fccc SHA512 9d920cd8fa0e772c3675eb319fc5bedc60962469c5d649640447f98a2f774c155e506ba03c65b4837aab68bbaa2a83c2a32aa172bda307f8441c7877098aa8f7
 EBUILD openpyxl-9999.ebuild 744 BLAKE2B 83fc282e5d97b801a2dfaa72f2e10918ce74ff4beadd3cd1b3235e60847dd8e38ce9289b955a9e9cc4d29b47d01524b36c31b902c1779926c6d54c4bb7e72ce0 SHA512 c8a857c719be0df90775c3709caa816e456cd1f3466931c876200d04c2bcfc1c3f90599a60f366be76364a870ae5d838cea964d16949fdf9663563364dee0584
 MISC metadata.xml 519 BLAKE2B 29b675ac6f0a0e38ae80b3f3f9d1a63bc2027f7d7def1f9dfac5fcb36cfbf19115eb9cbc94a98f1b99eca7557fd96b3d8c8c1aa00f67800de497671fff0a809e SHA512 e9d571588fa37161b57b5a65739ba59a9058392d1e96f004193054ac0605f1a144be1e0d1ba4b199fd1f49365d44e568b8ab00f3b051bb2a736c0c5926aa9f44
diff --git a/dev-python/openpyxl/openpyxl-3.0.3.ebuild b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
new file mode 100644
index 000000000000..fbd7e799e45c
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+# Upstream doesn't want to include tests in PyPI tarballs
+# https://bitbucket.org/openpyxl/openpyxl/issues/1308/include-tests-in-pypi-tarballs
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 0db2f6bd99cc..9d537d4f21df 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,3 @@
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
-EBUILD openstackdocstheme-1.18.1.ebuild 601 BLAKE2B 3ff6cdc84e04b8fcdc664b21e58387d9b8d9b703e53561d699870255fb01fff16a02641d02cafb649b8c90649a9f188cb1f2cca3d1e3c6934937f989415927e7 SHA512 6292bdfeffa63a809c7ebc88d87cace59e3226a480bc81a7aaa187b5810f4cb0c44861e6d0248fc8db83ca8b36495c43d7ce786d6dfbc60384bc7bbe05b33f4d
+EBUILD openstackdocstheme-1.18.1.ebuild 608 BLAKE2B 5168d48c4c1aee24f269cad82721d76c08eabdc734c4b7e955989548ab0b4cb4d80a8bcb1a8a51e868664636169b1adf5727c20344aae1f22dd67f251d33be1f SHA512 da49e13f0425b5b10cec7b3e0e5db833eab8b60cc62b2456086bb79e32111fc5db506098fbf3da0ab3e04bd5d1457848536914367a0f2a453ed1d7a8210b8a0b
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
index e6b6fc941dd4..40f43c5d2d37 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 09f3ab97c000..205f71d865a8 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,5 +1,5 @@
 DIST os-brick-2.8.2.tar.gz 179510 BLAKE2B c72c1f0260fc541a9f6ca9f984b934f718dadd7ec0909a4b2483bb190e1ad587084174a33e1a7c81a52728817286bc3887474ea2c39d7f43e8e71a4a9a4baaef SHA512 0e9237f9baf5338d123bec1b22285ff8c4c31a89d60cf8480985a144c45c2766322cb359f3d548676b2631883664c5797e687bbe4d2d9ec5cd38e10e53d394ff
 DIST os-brick-3.0.1.tar.gz 189358 BLAKE2B 331e06a49afa6d973149425946ffc3fc2b2173cc15faa9b9a6cfb231eb9e806fe10902eb86302c6a020dd4a986f0725550f12b9f54f78b9cd4fd3302d83f5eee SHA512 5283cacd1aef10a7b470d5338801fbf5741ee26ba831d12887f829f7e5744c6a9eb2db4048586214f6ed64de867645e1a6f3b5841fff5328416c5548a66dcd00
 EBUILD os-brick-2.8.2.ebuild 1458 BLAKE2B aadfe1bb39d49f87e8da9f8bd14291eb8d414a1b38acca29fd12022fec5c0d58a944a46bb2eb29796ff65fb9a417fc2cb2e6493ca59fac90557891367e88c55c SHA512 46ff984e089bd29223627f368b31ec34e60ffa42fb22fe64525b4404de638dd8d9c6cbf1a6906d4a9bd68520bb7f31f7f5d19e6354f03fa342bbc89ba54eb73b
-EBUILD os-brick-3.0.1.ebuild 1600 BLAKE2B 656a9f29dd1e4db876b6dca2ceabed6847665fff61efbbbbbf554c3fd2e59bb8d1483d97a16f28000896f53275c8701a173fd2b0fd0957915501e2084e7761b0 SHA512 b2c1db11bebf64c24b429b41b90c68a1e9135b12be53d69051995b54c4e29fafd5684789d1c0a92338f820c8aa516718c679c2c829c0863e904c63a9c44927ce
+EBUILD os-brick-3.0.1.ebuild 1598 BLAKE2B d22959e8795da0fbcb48f9ea06385585846d25be8713a3dbf806e04249670905d63d2b04dea87b1fe4369ecdca7b62c5f0fd3fb8739887a2014bf9a5988bc75b SHA512 355331e77ed709f4f7306e349afee02191256bef8f2c80ca7c3873cfe35240a5f65d53cdcf9246c969e8dcd759ee50f80b4305ce5735c55bb60d608e1739d3f7
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-3.0.1.ebuild b/dev-python/os-brick/os-brick-3.0.1.ebuild
index 328d913d2dbd..7f6275304115 100644
--- a/dev-python/os-brick/os-brick-3.0.1.ebuild
+++ b/dev-python/os-brick/os-brick-3.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 82fc6400f738..99e3f589921e 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,5 +1,5 @@
 DIST os-traits-0.16.0.tar.gz 24583 BLAKE2B 8f81c4ae3cd88f74b7b44033800af4475c2e76cf4ca402504bb54444c3952fa97a2871336bcdd4a5ed870e423c1201fe0ca658d663d19286098641efd88bc060 SHA512 93ff4c066e0819cacf3a8cc8b80b05960e7a4b7c31af1d249f61f95eac1f37ea21f0f1ddb6e6dbc5b9c023394e10db88a105bbfbbfaf10afc57078040838a8f7
 DIST os-traits-2.3.0.tar.gz 25968 BLAKE2B 9c749ca63f7d67e979a732fbc5de3285ec2635a6ca92fae26f8801e9d9f3dcd1a09b3eacb10162a5e53be932ddc48a8f379a17c8cfb3dbe6114339c35d943111 SHA512 0dd7379dded33a89e1163fb929cc50016474912817f99f048abf325cedd9369d155cf8ecfdcd868ec1bf124c0a44f9926daeffa68877bf723f78a15f6c091e90
 EBUILD os-traits-0.16.0.ebuild 725 BLAKE2B d12117c2f4317fc72b1c2c7a85d803b51fae25f9e11faac73bd120dad8fdb2de01cdc8d66c2126e88f8b0b18ae21a20ba50a81d90e138e74353e8cf058a3ad2a SHA512 c42f01be3ea291fc5a5876075e189f55ed88490f019e9555bce3ff7e49bdb1a291da5f6fd61555c0b10d6c3b34cc6dc859ad43643b10ef7ba0c00084c3dbe553
-EBUILD os-traits-2.3.0.ebuild 680 BLAKE2B 8ad4b101153f33bd89469ff610aa2f0647bc9f935cb7384563d2278bfdfe49333b62849801dd4bc4f0efea71fc56e3ba6dfe952fb1e2da925452e8c5dec8a30c SHA512 dda5d1beb383914e6f6fe7639f16167039ee82ef526dde48220a8dc1d5ec295bef2536dc162571a7aa4af4c8c111efb41a331851d1ba5c94e9c91bbd8417cd97
+EBUILD os-traits-2.3.0.ebuild 678 BLAKE2B db66000923e361f0cbd2db62a170bdd318f4558c33210ef36701d44ff450d24f8249bb3a9cb6553c5524822e72b7a66300d71d4c915b9bd97c41c7272b5dd35a SHA512 25433ca2fb0278b80984662685017ec7899dfc7a5bd46436ec68e5f6e884f8e49b571f9a30b45f23eae8e8e7be9bca1f0ead753415cd37743121d55e66c975fd
 MISC metadata.xml 385 BLAKE2B 2ba965a78d301c8f0b65378ff482552eba70236b457b96461367e0ffa5cbab79ddac2296cab4184803f7970e4162faa0ace82762ff356eef2e739625bfc99878 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d
diff --git a/dev-python/os-traits/os-traits-2.3.0.ebuild b/dev-python/os-traits/os-traits-2.3.0.ebuild
index 57385c932b61..0b5e0d5cd906 100644
--- a/dev-python/os-traits/os-traits-2.3.0.ebuild
+++ b/dev-python/os-traits/os-traits-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index b6f8223d514f..9c2d12ef6356 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-cache-1.33.3.tar.gz 56098 BLAKE2B b3d2ab549a2b2066ffdfc5d9b680da35501818719a8c6f460be1520c2d6342f1c41f0f1aa20ffdcc45958e83e242515a3ec8bf69ce1273ab47a8a26e648069c8 SHA512 7edc1d8ceb00f2989093ec1809120f2aa552de2d5ce6176c9af56278040d652fc0d627e0f7f427b9bacaaa24cec7b0fe24568316d90a4e52054357bc9b9e30e2
+DIST oslo-cache-2.3.0.tar.gz 57209 BLAKE2B aa34c4deb0206c86181e629b1ccedaa3b0b7a503f4648b9ffb23dcba84c98658017a720701176776652a2a58447c54662314dd4853ec6ccf6c2acebb4b559325 SHA512 c3ad9c326fa71985d4546bd20bcb8aa9508808c8eae2a9e3dac1c014d148bfa8f5a847eb2ca8d1a204cce07b6d640f9541491dd41c7c6169e993e408786358af
 EBUILD oslo-cache-1.33.3.ebuild 1064 BLAKE2B 753592d05bf39a8ac6ec16c056bddedb5e99b007d57679d277dd74e598531c8388fa19f421e8c5a537cd4269e5e448f2162e6f15ea02abb01135524580e66c80 SHA512 90195588142d161bfa928a5690ac37d0fd0b125c0f44448289251e12116357e9f1bb3fa232228022a8b348d297e338aff14abc3a736f450c137a073acb9b3d90
+EBUILD oslo-cache-2.3.0.ebuild 1023 BLAKE2B fc25169df8bb81be966a7e8776bd2d3d2d690f72ab56133841ae6937f1542fba589a60d054cf974d6072aa5f59180655b5da992d1cf9406243029cb81d7e497d SHA512 4f3c9aea97dcb20064430c073553f4d927d01b6dff2895e33159f5a7eeba73ffe51fd0bd6d541aab1ca443271878acca6ad82eb50b8c0471ec269a98b6bce242
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
new file mode 100644
index 000000000000..617334205e5a
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index b09c482ee957..a4b7c8fc20c1 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.concurrency-3.29.1.tar.gz 51785 BLAKE2B 4035981fcff3cb4384209f3b640b928dfacd13e324c9df1dfebb0c5230727736ff803b478e506b08ac4bd7bd405763b93bdb951b01751a5e293daa33df860c8e SHA512 f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
+DIST oslo.concurrency-4.0.2.tar.gz 53910 BLAKE2B 090d9ba4b5267f63edf6cbc6f585e48019a4ac293e24914a8f7c52009b34ce9a4822a8705934c642663bd2a09be3085458868159ef041498e2085e4ccbec50f9 SHA512 ca1ef615ebe986acac853666877061bbc7a02c09bec294ec6221ae4800a561cf9f218855f7eb8b96184d645924e5c68963b47116835c7d2495de83617439d1ef
 EBUILD oslo-concurrency-3.29.1.ebuild 1815 BLAKE2B 72279de34583eec51ce337093b9b0efc24628e10a9ec07dbf981560a8cf77331d80a3b5950aa1df52034282995b441ef7317547caff41257daadbdec11799cc1 SHA512 9576baba99ea2de1b6d241fb4f2cb8537126099070cf24e08f618ab08c05d13bec23cf3c0c18005edec3d58b873fc90205ffc1dd978b4f1bc9e0383f480bc23b
+EBUILD oslo-concurrency-4.0.2.ebuild 921 BLAKE2B c70117bf079d08c7187cfd6a0a886a761b24234912fc48115101e4975d2f0e627a4d09b36f1c865f396911c31311f56ec2b64a35f754f0c56573f3a66a2f859d SHA512 5ba1207cce8e69ed2156a160b2d325b0270f54d10e713a124bf57f4e848916546861832d4b4f4edb47ded5c2ed18f11c6d6e4891df0eb8c76001d6c7fee26400
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
new file mode 100644
index 000000000000..7d4e1b76c591
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="library for running  multi-thread, multi-process applications"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
+S="${WORKDIR}/oslo.concurrency-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+RESTRICT=""
+
+CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 53c7cdfe1545..4885f68fce96 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
+DIST oslo-config-8.0.2.tar.gz 148224 BLAKE2B 5f3bc55857a01429063a0c7afbce041f48952ca1db7bd732e83d40d68f86951db9bcdb79a80926c5b7ec747fde574817cc6a562c217b441b0bb61381d70ca4b6 SHA512 675ec0602cc8850e7a25733d24ead104a85541f09983924d90b829687fde22c5fe3947a67e0b8a024927b3fd40973cc7c144b26ba751cd86650ca210686ea8e5
 EBUILD oslo-config-6.11.2.ebuild 1306 BLAKE2B b5487b165d8d0033e059f12e8659d65337cb5440bdb1842cdbe8a5f4cc7dc7955b35d0b903a1a3eb107c979debd205ef7de6346e21550a880536fa3a1b6f7806 SHA512 cfc567e14554504a9a4251a50cc6a6404938063868d19d5a4f9fc85d7a675c0870f4f2c50e32492400ff0a83cf1f3edea888ed4d16e528e7e9f49604a7c70893
+EBUILD oslo-config-8.0.2.ebuild 1265 BLAKE2B 3c283fc58e731e4e1de29a806bef99019966b6da3596add9434e02ac69b94a1c31064c76f011df5ec4e5c1074ceffee3277f1728532813e0aa2807b092c03c3b SHA512 43045a80be041b522081373fac8038f87f1b61103b48edc1c7f2fbbb7f63b219162571f4b3f7d557809186b996419307f57774c29a7fa51c00c3ce9a1fe13876
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-8.0.2.ebuild b/dev-python/oslo-config/oslo-config-8.0.2.ebuild
new file mode 100644
index 000000000000..ceaab62f1656
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-8.0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 96f2037beee8..031f8b7dda13 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.db-4.45.0.tar.gz 172505 BLAKE2B b280daf94dcdcaa21051bb1c8d611199725b7ad9017225f16ef2ae7342941a6b2bd474b1598cdb54e301f5143c985f250ec1b1f64cddf2ac3cb71a03d9acf589 SHA512 f976ff2aab1e39ce253618ed5669ee0b824ada03073028a990899784d96378eb7c5a2476e1a60ab9afa5a30fd8e34c84b0545d63a7f3c522cad9c7423208b1ba
+DIST oslo.db-8.1.0.tar.gz 171252 BLAKE2B dbf6f580d95ce06f0ab4a50cf289765a2fa55459c56b89f079cbe93b319c1ebdd4287c47a7b69e0bff1ff91149f2dc9c7b8d90769f17cca26f42a2d0a69e46d6 SHA512 3070561990c630a26c936f787be1cacc7747b915bf01178624047551891c9e44b3d17a8d818bfac259d7083a8bbadba1859ade4a15821c00316bdb3860056208
 EBUILD oslo-db-4.45.0.ebuild 2126 BLAKE2B c304a08e657950229de40bba7eb90153b62003060b96c2c98149696e9712651eefa636a8ab936008d399be25006cf1189eacf7409db0b5a19d7488800c070c84 SHA512 a3a59c744bceeac135d28f46f2edbf50a6abd68d2ef95cd644df0cb1b26585992981270ac701a23df02d173010e7855f4c606af27c6a84b05c031534cadcd93f
+EBUILD oslo-db-8.1.0.ebuild 1476 BLAKE2B 90214b1966ab90c3b90b61f4fde3b3befca038c18b6265705d5ea6b745907d20ec7301aa02d33ec811545292327a25f75858cdbdb570f9da7a3dbef3cbb398ce SHA512 1f9dce5db51c45fa7890334a54ec6416b9e7c64c28b7de541f09407ccd63422e8131bc1344f09ebc7f498e59e296d421e69639ef28f16b4d019068242bfafb45
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-8.1.0.ebuild b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
new file mode 100644
index 000000000000..216614e84cb7
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/alembic-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^testresources/d' requirements.txt || die
+	sed -i '/^testscenarios/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 4f3d9fb8e1be..39f0796e3b34 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.log-3.44.1.tar.gz 87427 BLAKE2B 225f855c2539557d4d673c23fd58618c669864ea3d5c13f6ffdfc64b4926fd33ec45b6730671b4fe70a105aee39adea63af88a735dabbd5fe9588afb1fd9e2dc SHA512 b8c655bbe2e49b1d69ba7a68c9f115f012d75f0bc0fa1d5583d692b01e65dc17c956fc738cf8092ebb90ac9605c644989526fab4132f23ddef92835ff433e1ca
+DIST oslo.log-4.1.2.tar.gz 87095 BLAKE2B 20dd69c5002f33c288c7c04818435076ffba112b91e0f5726cb32674f10e162e378bce221278428714aa827cee81253cc21bb0588934cd024b7948b349e60a76 SHA512 f34ed66bd289fc88420d02d67ce59b498274d44f43d20b53cef1369699d715ec9706a5f62b81de3005010de1e1fa4c36aa935ee72f81160a75cbda3596a0d167
 EBUILD oslo-log-3.44.1.ebuild 1314 BLAKE2B 3210cc03011bb3a427d514033f0a65a537a5b5b672a222c38b9515b77fd4e00b86ee9fd6e7a5450722931a65030a3563207bf00d47f72ec71e605def7f14160c SHA512 e67dfb0104f968ac1859e564823d5a7b2be6633822b06599dc78648b27db1734945c520f3d86da6ae47f84ce68cd9b27ae5445d5f25fe251adb95a811340fb99
+EBUILD oslo-log-4.1.2.ebuild 1273 BLAKE2B be8e807df3640d542a0b80b5024bec7c6fcbf3fb124f2b48de90504bb6ea6801c55f3effde8d5629778e79b99fe4003c2ad5cfb3a2ae3dcfb1d583c349657150 SHA512 d8f71fce7d6fc2028f4f6371795e54aefd8fe7a501c005462d0af747e126fe61e3064ce19c6a710db80d5ef41d36c9ead5984a904e247e8a23ce3b71b692bbb6
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-4.1.2.ebuild b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
new file mode 100644
index 000000000000..fa80b804fb41
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 75cc7d23317a..13d0023641c2 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
 DIST oslo.messaging-12.1.0.tar.gz 253854 BLAKE2B 6db26884f69be59cecd904b8ca0edc44a7f4e6a50ada154f28bf3a2a431896345ea7981ad7b195c12abe3f4d78d259c036e18e5544d2564e04d373c7cf2575b0 SHA512 1649f3520b6785eb5bf0f68cf174c1f60f32675ab6fa1400997704e97df7b24dcd63de751ab2313b839619b4eb250612ea32996c6c3c9956f7145010ca38cba2
 EBUILD oslo-messaging-10.2.0.ebuild 1659 BLAKE2B 2c7381dfc84b54ae7260f68699baba2f017233738829259c3623fd57b87ff988fa299be89f4c37bfeb10419f8876fe2e323a3ad94fcaabeb955354107042f60a SHA512 b08d716fc977fd966c27d0fe873f229fc6a8bdda96895e975436785c9e9d6f435e31176a914f0be6ffcd4f122a354d57b0452dbbf4e6c20a89dc8065f9ac039a
-EBUILD oslo-messaging-12.1.0.ebuild 1657 BLAKE2B ee3291ac61488c7d758eacdf0c4e3464d4744b731305d652ac74196fff83c004a5cd0be289af1fe79644528b268dbeb2aeffa4ed9d0b045f2e8e39c1d7beedb3 SHA512 331e6a745f999bb295f5a1abc14c3a54126b4f63a9c78bfb093a951d601a2f0105237f66dea5606b154866590ea7705da2ef48776a3c708282a001c218346449
+EBUILD oslo-messaging-12.1.0.ebuild 1655 BLAKE2B 39675af234182615ecb6be434e76b453cca4b4c41decd32a56fcff6ce3a48063da0e3ef1c5aaca6c3c19b8a85abc4e7344b17a9150a42ea4236d3709b7a6e229 SHA512 826aa5ce473aa5b1f30e046adf856b9ba213a5762c4669c5df40bc6cad73c645dde5a9da87792d308404512156fa2284583851508db21f8a3c6f2f6bebd88ad6
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild
index 9e9105ff46e7..ef31654a32a3 100644
--- a/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index bc47fd040fde..b3a5f9b721fd 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.middleware-3.37.1.tar.gz 56354 BLAKE2B e9b119d2163c3949eb98b7580b4d5aa4a4427b9a8b3a841549f282358d8daefe62cc3f0588535c744aab7b77b44d38691316f50b9d60e5c974e3a0714a367699 SHA512 1864b2c25602ac7e27e2b080617f7af5f38083705735893dde744e7535d127d62ab0f29a0ef2575ec53af22969544d83e454bc5913b5719c4eb7d312764fa5c0
+DIST oslo.middleware-4.0.2.tar.gz 56678 BLAKE2B 5e548f35eccb896447337317dc68d2294c6cf9a064c8cf938c205dbea47af11107d98efdfbfa1829dd2c4f74bd6a9ab51854cdb267321c1b80dc8f9f5ccdf3ee SHA512 8be5fcd85b3afcd0115f4c700f7b2e8846d5b23f0e93765e2cf693b2e0f982a9a8feee6648e261e36890a8a57c28dc550d2d65e5ebc209a4e709b463e5f8ce04
 EBUILD oslo-middleware-3.37.1.ebuild 2018 BLAKE2B 0bb6bf29c5d9fc8580a3df64abd2a559cf0d9e2fd1df686b3fafcd3fc6dbc38322d720dbf08c65644e5dad7ad11dd5b1e469aa3e42ccb3c8cfad66a44e74d9a6 SHA512 b16ec22d46819772c88369c01941d3dbcf3a56245c64f08a714b14d5487c14cd34e1175179d9d1b1135f40b0af3390d3ace3066c01d3f776b3995350830e0fe8
+EBUILD oslo-middleware-4.0.2.ebuild 1164 BLAKE2B eab966da85c28f0091e8ddf65f338e2365bef0b1d5daa765bc2426e9fda9ce5ca862923d8bd30987b650e4b36b131675f012ffbbeed4d00c5165ce26e485019e SHA512 dfc32935b9ba31e7b070929677f4de6eb49772a5329954e298ee4b8b47cde5a08cf31d876c8f047b8c51147269ee9fb34b3842a73168fc28de1478384cdd19ca
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild b/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
new file mode 100644
index 000000000000..6ad72d5e3427
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
+HOMEPAGE="https://pypi.org/project/oslo.middleware/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+RESTRICT=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index b3b26873717b..44f383569906 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.policy-2.3.3.tar.gz 93581 BLAKE2B 50d1b45b596242b901a5b583b412c90d55b2ea9501dab29fa24be7b1c64eacf89f0f7df742f897503ab3c09399bfca25b93ed9cc3aa2377a72986f73bb96f1e4 SHA512 b4a2febe240582dbad8306e2208bfb7bd83c2783002544428b5888a8930d959919f10044eb2c30579e2fe61a6958ebefce4300f1778798b201714232a2edb88f
 DIST oslo.policy-3.1.0.tar.gz 94290 BLAKE2B 90257806c834317b509d7b7e72ed00166b71fb692c68d86ce9ef3a4fe2fa671625ba677a4b86fd2ab43f4cc04d1b7f54314c80c1baea8baf0d116689cd178618 SHA512 61f7267abb1268627ba50f2a7d4196c6a6805aa3bbb5c3bb26d8c96d2c526d24102d11fab39e7043722dbd64f32848fbc277cda7699e76334fa73afff8adba54
 EBUILD oslo-policy-2.3.3.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
-EBUILD oslo-policy-3.1.0.ebuild 1150 BLAKE2B 21f527c8fc651eb08a19f73e61127d92e222914580bc1ae0a3c27f837c138d066650ea12acfd522a0b82cd80a021b74dd4e8f2b31d8122d3c0c8f797bb8e837e SHA512 03bcfd4b6fb5198ddb3e9de650df82456be1a3c2a80864aa38413bf21e06fcb467bbc6cff24562b5223aab2e55d57e6df35f3cd83c219af2ed87188617d1839f
+EBUILD oslo-policy-3.1.0.ebuild 1148 BLAKE2B f5daf6bb6372625486725325df48c3fdafa80705555c9dc44500385ba37bc198bfd5b9e277d502883bcba9973ebe227d67ae9c5984b204089085702c496d3e0f SHA512 36ee4e5af51fe21473ef9a663452c9f48c4f931e8294e621ff3d652eca9c08431aa8ed216517e7d19039e8422bffe080ee396637680877a265e07dcdd9200abf
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild b/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild
index 6f8fabf2b9bf..6e917950a2e5 100644
--- a/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 6b12ea77ebe3..a0a706525d1e 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
+DIST oslo-serialization-3.1.1.tar.gz 32180 BLAKE2B 5ce0db206732430b2553b0eb01d5df717069a07370a20ef452b77e83ed95f1cd0542eac287ba28d4fd2a3f66541823c362a925e48a3ed175abdbab2c1aa5b2f2 SHA512 5a551c33a001eeb73213dac1b4e4bc50db2ceb7dc2f9881c07abbab05cc8ccfda4d73cc9bdc673e26628aaa05c3d66f9c76ba4eb370c851990f3614b33233a95
 EBUILD oslo-serialization-2.28.2.ebuild 2076 BLAKE2B f06a95e8223ad64c4056587654ef214a73363437e0772f18f42cc6e0f6defa38feedb97840e1c8052ada654aaa88e053c6504daba9ba37c04aa43e48515b3121 SHA512 a8d776dbe338b0aa799db28d0701b073aa78239b666afbfdad1634c8a02c679c6d94b326afd5c54d29dbd0f2f1376deba2d3fb4573794a8987dd591329937640
+EBUILD oslo-serialization-3.1.1.ebuild 1003 BLAKE2B 638027c5c6ba4eb54763df3d126e915c412b132246ba622ec57e145bf214ccec16c55202c0fe05ff5ed883069ff69a7b0b60cd4ae9124e567f715f94f61293f1 SHA512 f720ee345e5937028fff4c2dc7fc1d3c5f5a4e34e8d6a580c2605301663e0918982d18922f37799d424712ec7ff1ac9afe0fb1f8c1646520c4ce04ecfd6c49b4
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
new file mode 100644
index 000000000000..2b721387653a
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index b582ac63f3de..294e1bb7cf77 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.service-1.40.2.tar.gz 80334 BLAKE2B 6000ba70c414ae6396f8be3911511b073f0f6a73a3a98e92e0c662b42a637b4cccbe684ceb1df2613aedad3fbd430ff588dca001997293563f39525efba05d99 SHA512 e412ae3d96e7e7f5f40238b3b9d9623a36347c3d8c6e06baa11133da71d4f5e55bd1ac2f43b45a2f84f725f84c59ec6870bc557fb623ab681bbeec27bffd086d
+DIST oslo.service-2.1.1.tar.gz 81030 BLAKE2B f6221d9e3d7624dccb614b2dbe6529937fd00495db80cddd9412c53fdacd4a5c5a5fe33468ab53c65e0cb741e82519de971f19d662e633f658641c978dcf0b2b SHA512 8d2beba973444eb6ef32c011928376b6ba61388837178f9043105100f05644137d9bf6ae235c4c7260b05d956bfda42890dcd5727dd4d6f9559e7206f7139f95
 EBUILD oslo-service-1.40.2.ebuild 1543 BLAKE2B c4a8cd555c697c7acf2c8d9443b3b4ed6147e2d564aebf1c7ce51ee51e2750a5540a72f7d3ee3058f6ceaf224c49c9c4c99af511804c4c944c1fa8650ac405e2 SHA512 03bf0a1d45ff7a26b3d6812eeaa5a72e89cc33f93dbb127899ab05cfca9b0f4c9da16c41d28b201a35f8f5ff958f20ae099ed2aa9657da913fb98c481df72ea6
+EBUILD oslo-service-2.1.1.ebuild 1547 BLAKE2B 14f5d5f5111908ab19e2a8768e075ce240ad2e3d22203a7b155c632bfc0b7ce7d931ab43f727467e7c028f377ce51492a9a1296db0981f724db33211925883b9 SHA512 ad23b3f405f148dd24fd6242c4b9ee9ab7074924415984ade15543a2e2906a693594f38a4fd39338d3ca3fcd64bf2ef327865c7db28b906f8c38e0e6193b2275
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-2.1.1.ebuild b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
new file mode 100644
index 000000000000..d318fd27e7b2
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/yappi-1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index 9b1e76d82d84..3dae9234b7ba 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-upgradecheck-0.2.1.tar.gz 14624 BLAKE2B 0b6e397c67df12f3162f4f05334b775e05ec253f642d707a262901b90120eedeef7aaaa3764c04620426e62031f953096cba975dc3e8dc7da3e091c7ac8f2d57 SHA512 26c771b3bc07b9d13fea6638330c785ef82781e794084088bbf46ec811a615e58123d5a42d17a9e31685308a4c1d2ccb7b839c32d9f454e3934d5fb625b73816
+DIST oslo-upgradecheck-1.0.1.tar.gz 15636 BLAKE2B 1247658ae351e11b3320415cd66bb5831bd018bced2e0440dc882d4c945dc81111544b063fb78e4b812d50c21ef7bde3eee30f8f12724d00077a32a05bb308c2 SHA512 92a8cfe51e4ddcdd7a1e8cab7296e7702a1389cbc9df17d0c5da133b21413efb5a650495d1b3bd2e2a58c376dd8c844e96ae20d2d56d387c29de635918a96d30
 EBUILD oslo-upgradecheck-0.2.1.ebuild 949 BLAKE2B 40465a982f8a25b4c8c2b5da23465ffcb2846347fc62822d7366f3c55632872154b7a5f2e73149ae8a548bcf72525dfd2026091ce3de0b597f6c83be6c1334ec SHA512 c23bbd5028e04c793b48ea37196a8bdf0bf72b4543f21e6b671cbd97392a71e7a3f0f54042f22bdec18269324905753f146c44e1dcfd0673bf6a3d2be4594f1e
+EBUILD oslo-upgradecheck-1.0.1.ebuild 951 BLAKE2B 5169a766dbdcdc2cd21518412fed13ae114a78ef685968f445361499dd457da4924d7847571dd6ad175d2cd95d807a5feab3c2b1e8314b2d09936bb11be97900 SHA512 688089daf4622f8e07d13ac154a01f521f3eb84130f3b9a8017469f6601860a1e48db9d43f871841ea2920f1249431063d4014d1c6dedfecbf7f826559f0d721
 MISC metadata.xml 373 BLAKE2B faf870e41a823c9dc8e6829fffc6cdc1852889bf17de0ef5b93f12321d86d7cc538368cb93edc56807aca7f25e0d75255045acbc6cfa60329aaea35e78721346 SHA512 c82e432bee2d34b39fca929ba2b602d65d13167c555eb0a3b07d39c5ae864bb4d6ac459449200bd767f040307ebf854e0a99d72d5ba1f965053190eed68c401c
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
new file mode 100644
index 000000000000..c3202a21255e
--- /dev/null
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 3f3517f72ff3..441400c3b59c 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-utils-3.41.5.tar.gz 91662 BLAKE2B 28ab74823b68cdf427396e5e357f567be5540eaf28e56416015d41ba76ddbe0970064b672c46b53bf23c2dfaae442462fa89d1e140e5f5a271db6e72e4b3e615 SHA512 0d9f9a99a48c0d6623947df6557eca24ebb2ae21d110e1c2a37e09c89fc2749d3ae480bfb534b3a2e3a6f9e7b0db126497f3403825b1272a30f532aa57795b04
 DIST oslo-utils-4.1.1.tar.gz 92838 BLAKE2B f468f77bc72124c404d4aac2b8ca9fd7f05140e45bfcc9b19e04e5d3181532fd82f941b7a00d22f1cb656ae46dc205e7da449772666a8892b8d7ea6469bb6505 SHA512 d6388af59caa7531901eb5585e1dd9eca544dd722bb4cdafb19221c33c543508306415f504b27559366eec2a9c7102acb181d8b833ee038e46e90567208daefd
 EBUILD oslo-utils-3.41.5.ebuild 2993 BLAKE2B 9227ce9e1b4e41051590efe145bbd63463becba6a6da1808925ee88a25a4c73f3dacda976d2e30869608d0ad6386e2dec86b189d4e67231155e85e543d223f71 SHA512 93f08ce2acd34994393f33961d5b07309883cb9091dae741abab3eea5e5e11fab7ad63de6691469c86f70a5d7976cdf6bd83fc2f293224508e930dd6e28f04b4
-EBUILD oslo-utils-4.1.1.ebuild 2441 BLAKE2B 42c56c8118abbf75815af7fb3a9c0c96855b7965a072e81444d68446f07e4afd3788bff8e764f70f110bd906b31b513871c3f1f03792351501e8aa22d2d41248 SHA512 0111114e3087b12ea316095bb3e4b91c67d76e3bb0567e0c6f9c0175c12be4e76a2e40a189574ddc93904e7b7f8c234af27d357ceca35700477950e78accf656
+EBUILD oslo-utils-4.1.1.ebuild 2439 BLAKE2B 587dd08ddc8114c9192b4020f90e7a235e37138967cb4ba74bcf579bc7d7049a7663b73e31732cd0436d19a10e7bdd80057c0ba6daa2b6d2f6aa4824c725a44d SHA512 c5731b398ecf7b1adfae81ce1e595d7bb8cc48f49cf07049bc0e4fe23fccb3a07e35ea2bad98b10cbd1d423b74ff4a5d0cf87e8ed445181d96f2062c282b22c6
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild b/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild
index eed1c4c3fe24..52ecfe5ad491 100644
--- a/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 1b69688905e8..9e18993082ef 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.versionedobjects-1.35.1.tar.gz 150347 BLAKE2B 2b19ff4056eaa4106adb255b4ca0c3c2c4e07ee6a3839a079f6ac9891383c02b1a913833853e4c8e8c6d67f2880b9f2966b1e5d9d20e9093a8f37a1063cdccdf SHA512 f115ef300d4274cca00fac938a5f62c920a8a44901fe40d7c016498718c1e0357cf8eb745213986a89455b33e9dfbfe10b0fcb76551ad815859e7204e5532307
+DIST oslo.versionedobjects-2.0.2.tar.gz 152102 BLAKE2B 6b7d19d0a17d895e65eaa15ccf4fcbf71dab10ada019ba9c2d7701ba8d7b3111542bb5be6be9d4ebe9d659c4b74f6d406a354f9e1f5990983ad36c6576ef8e80 SHA512 0c544ef33c213f8823a7ec9c2714d3053e9db0a6bdc69f8c41654c0117a2f2b43c94bc6dcd2d6f98c8447e85694382be5df9d57fe21b4718cc811d9589582f66
 EBUILD oslo-versionedobjects-1.35.1.ebuild 1345 BLAKE2B 3a6f24e9c06a0aa63ccc2738c8ca008d4096c0434753fe6ac94f12e5ac25490868bb091dd8c3a2525c6d4f200b2983cba4db0c7b05869de4f2f7761153d9d801 SHA512 0402a890433ff23f6f790d733f5756ef07c4a7cbf2835cbf33a43f66db773a984a98b1a827a60f106f120de12cd8ec36ebc5196c0789848d87747e1232a3a1d3
+EBUILD oslo-versionedobjects-2.0.2.ebuild 1304 BLAKE2B 2cbd23c851aa83ebdd75c16455f813bbcf0677e67f34acb2ed23e528b1707e33801822b94a3d47fa5a9d7c2d72d8172adf514e37788f966362dd6f315b5adcbb SHA512 9d0e21b0f55ea706027835f5bce97529198daa9308e600026f16793f82a0d7cf27a57ce199f763126347a5639c98910e38b4908e34c16e01309b43796e51c5fc
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
new file mode 100644
index 000000000000..f87856097ade
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index c41d54bf34d3..f52184c230a2 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.vmware-2.32.2.tar.gz 334130 BLAKE2B ba1fcec92812613fc202afd8d5eab3c4de65f2451bf17dbae383dd6176a0fda73d1661c1d066e3c9fa24686562c46b0b8927f359632d8f2f94c9d3d185ef802d SHA512 2f18f38590221a14e876607ccb9b8d1b5f25cca1e714c3256980b1f818ac1a1d2f9d3f1418bee7289b1efe01bfff1ae17f76663eb4a96a90e4d17a05dc39e91f
 DIST oslo.vmware-3.3.1.tar.gz 334352 BLAKE2B 54fecc7ea66aa36091938ae47f4cf9c59eba9ae06644ee77d7a1caff11d59c4a2da2ed93c908735b9e8478e9bfcfde5db49a16134f78d898026cf447a4251d1e SHA512 db816da1c472ae861a3a28e17bf87c70fcb41c8f982bc461ce9e9c1c5607b84e5a72321f5f4761c6646c3b72335e450872f872d90980030d8f014e1f1d08ec46
 EBUILD oslo-vmware-2.32.2.ebuild 2303 BLAKE2B d8fce2f54cdca73a9df23990888f3daab9c11a6ae08caf9bd22e2abd36d1996cbfe657e6624d821bfaa5415c356cac906b2a4d093b54cab995d1d29f064d7a1d SHA512 2a54eda44ed89ef024ac776356a4881db247fefefe289ba9833bb0813f5121d8d91f88de700d376a8d2952f677953aa2447786365428f4aeaccb07e80da82f87
-EBUILD oslo-vmware-3.3.1.ebuild 1973 BLAKE2B 04af46e85da12efdd9743d745a4279aec2f822cc6edf58e4ae6ab1b3170dfbd16fecd7ba5278bb444a97533910ff4f64791120a1552d0113529fc0d6bcf55a75 SHA512 ea73d47b32a627d06f46061b69a1c8503d6ac1ca775f889f3bda71237a899010d24fb13d64c85ff57acd152d42eb665a4dee2cfc08c43665ef4b0a0d6dd281f2
+EBUILD oslo-vmware-3.3.1.ebuild 1971 BLAKE2B 1f5bccfdbede69b046ef2e503e03adbb066657fa606348329b9cc4d6d11e34da7f80662869de06a8bbf78e3fc0c3c96df7d50e51ff3b840cc7aef7b647a173ff SHA512 4ed31fd80192c60b8230009b0698b2cb5998a090d5b9b1fdd8c134252fd43318c00ea86fe6b9ce0e3e35d9c26f27828bec2427ada929dda14f16c88ad86b4e44
 MISC metadata.xml 568 BLAKE2B e5ba6d5e5d14ace6be413a2bc6d97d8dd5f6befd0cfe683fdb6bb870cef7b673cc779ab143362b48181f62fa4f15eb827174f17da64c4d7ed539eef74e050136 SHA512 879bcc0237b70f9ab61a3d659e948e5d1289128b3b4f11f6797b0f20809c3cc90efa104a582dd6cb407fd9a7dd4f0e2330d68227dda145c9456875d44db913dc
diff --git a/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
index 577e06d76c8f..bce097ed10c8 100644
--- a/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.vmware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 11be23c63606..3fbc0192f697 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,5 @@
 DIST ovsdbapp-0.17.2.tar.gz 82830 BLAKE2B a9c7661685aeb215f79b9c14fb7069019ae3641217fd2234db44f4d7bada9c9533919a104ec5a0f05843edae2b71e86edab11e545973e626ea657eea852e0682 SHA512 0d7a5d5c0ea0456a2bdf51b39b864253b52d1699b32a301a549b80568fef63d516158dcb6772cfb97b88d56e840a070f5cc2569acaa414bcab4a65be673a66eb
 DIST ovsdbapp-1.1.0.tar.gz 82886 BLAKE2B 631658eefad233776bdbd8bc409e9f9b78274827465730af8fa99a5d5669f183555827eb59b1cce93c17e218bc7a9a56699d9fa816cbe1f5793cabf13105529a SHA512 b976ccbdad3e5b101f4c1d48ff41dc5654aa777a1f37b52b45f9344915236161745fc9faabd495a138e555c6cdc48ec6414884c4fba37627c6491ca2b9750a6c
 EBUILD ovsdbapp-0.17.2.ebuild 726 BLAKE2B 5c7b9ac30b8431c1d26fa02a68f240bd5eb1db020f00e2e1c4e5c836847ff7a939d0726f9772bd19dbf161dc33d43a37d12dec73beaa85ff29aefe550f4383b4 SHA512 7f474eeba18f7972b3b8e595732f909d3eb6fd4f61d807f574c61b111af72ca34a6370f43ede70f71ce9a1c7bf386979ddb290d027b961deb623edfd9aad9445
-EBUILD ovsdbapp-1.1.0.ebuild 724 BLAKE2B 7189e0d917f2952d1ff56455f3744e36085861b7bdf4009be1c304ad0a3020250c41d9c15238a35e8952ad766863cb79541b938dc8df59bd3544e7e3a6dab345 SHA512 e30551cf1f4b16cd4deeaff0885bcf0c38247f7900c1ff2a34b3b109c927901e08a6fff3a8fd31583f2a25e76cc2c1c2824ed1ce58254aa283ef7ab2058b3b0b
+EBUILD ovsdbapp-1.1.0.ebuild 722 BLAKE2B 482bdec3d9c05b808c9c2cbd8456f2b3a0699a6ab78ae8c80363c655d45f0ff4ef11dfb4d7628d27d042086884cb4d0db332c8723acc59ad105048bacd25f68f SHA512 601fac7fbe3af3ac8e2c3bcff5e1887f142b762af95e888b0c09866b0f8a075a88cdf049c4c6bcf76c6e374126f7e7b8e0c1af41230690004dd9982cc0bfa475
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild
index 0580470603c1..d913d07f481d 100644
--- a/dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 1b7d5816f155..5314998664bb 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,7 +1,9 @@
 AUX pandas-0.24.2-skip-broken-test.patch 644 BLAKE2B 8a879cb0cf3f9b2e7c80a649fe37730334a6c24d130578f0febb6aceb8857db375a38e136c498d3468f664bac0499fd60edeaa49c198ccc022a49fe11362476d SHA512 b3ac2e667b116ffca750bd0abb39408c696d6e8459b5a5a83417618bdcec1724a70a0ab3e15a3b314c25de4a1bccea73c226ca7df4dd80141b4befa204c392d4
 DIST pandas-0.24.2.tar.gz 11837693 BLAKE2B 3762e94554a3ae3c803c9a412c5c551c15a9fbf15cb05633f7d1b0ccbfddc646f68f0306666e688a83a4495b0537cea2fec671157f5a63aaa5f9cad6b791261e SHA512 0795c6bb8a47a511853558ea59d371b4540ec175f213cfba4ad2361d6481fea5d3f7074bb4961c32f2f0080a72d7436a9b3706f5cc692074f98d83bfc587fd15
 DIST pandas-1.0.1.tar.gz 4852368 BLAKE2B d6d3ae757d245b665e4b67bd237c090ddff97688934268b171e278a14d2439f5d993addc304f16a0ac9ab7bc34bfe36df807f998148106b062c567a5a7f14f4a SHA512 6755d17a4a4a8c3770f413199a12b3c4d6b5f5fcc925bec9b9b0f813fcd020df0b2c0a32dc8528c795b16556e00c078a03e4a6746192b44bfbd7ffc809c1e56c
+DIST pandas-1.0.4.tar.gz 5040267 BLAKE2B 2855b1708e1ae4c56b6118613ec644d010a3af7db474bb30aec3cf84e497371af03b63a2168f6daf0fc42da07274f8724734117c6aaea34f49eeafbf6ac73b9f SHA512 01ef73cab3db067ca4a29992d71aa637425b8d70473fde6ccfb359dfedc9546315c6d37d74f3825c924cab789c2536ec69db071a303cfc5e1a7897b253dd9467
 EBUILD pandas-0.24.2.ebuild 5376 BLAKE2B 9277f27158afa9b9989d89190d04a67165d6452fb8a83964c85582b6d984726499fb2d10aa684194d5414500e04d86fd3307a0b74330d35848952d2c6c780a84 SHA512 b2577e30bb76a8b86d3ed062acf3978ff885c355428b677a0cb66cdfb80de84a81eb6126753a94b642e608b19990589518acb7aa2ce7209ff5e04bbdd05748b2
 EBUILD pandas-1.0.1.ebuild 5375 BLAKE2B 558b287f3d7f754bb15fb691de2170805fee29358b50d7248953b99fd4bf83d01afec9d382015f10e549a561bd34b87225fcbab8c2fcdf035c312cc1515e584a SHA512 edcf506b007633a4676e49c29f6446dd9753a1362998a1b8ac05831b912af3a3e7effe9a1163e17d126e1565d777ddeafd3f66e9c467f150efbbe9c08dc1ed64
+EBUILD pandas-1.0.4.ebuild 5375 BLAKE2B 558b287f3d7f754bb15fb691de2170805fee29358b50d7248953b99fd4bf83d01afec9d382015f10e549a561bd34b87225fcbab8c2fcdf035c312cc1515e584a SHA512 edcf506b007633a4676e49c29f6446dd9753a1362998a1b8ac05831b912af3a3e7effe9a1163e17d126e1565d777ddeafd3f66e9c467f150efbbe9c08dc1ed64
 EBUILD pandas-9999.ebuild 5663 BLAKE2B 1b4c3889527930dd52d1a8a688b484acc524b318d6bd5b4b0c6cfceceeeb0b1b87b48476b5da8464e01c0d67cbcee93fe4b2aacb6679d1909d566bc8acc20bb5 SHA512 16ff9d6e6c0516ac468b23d4aa4b8e2b487b6404271a78b76bd8705df078d0d66e04a20dad1d65cda62d31ee5ec1965949202188c2450ebda45788896ad2bdbe
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/pandas-1.0.4.ebuild b/dev-python/pandas/pandas-1.0.4.ebuild
new file mode 100644
index 000000000000..c2bd75a1183a
--- /dev/null
+++ b/dev-python/pandas/pandas-1.0.4.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils flag-o-matic 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"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~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/s3fs[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.13.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${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}]
+		sci-libs/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/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${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} )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+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
+}
+
+python_test() {
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. virtx pytest pandas -v --skip-slow --skip-network \
+		-m "not single"
+	find . -name .pytest_cache -exec rm -r {} + || die
+	popd > /dev/null
+}
+
+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 "necessary for Amazon S3 access" dev-python/s3fs
+	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" sci-libs/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/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index 1e6b246f85da..8daa4038b12b 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,4 +1,4 @@
 DIST pandocfilters-1.4.2.tar.gz 14229 BLAKE2B 8d061435fc4368fe34f30d7ba7aa06a2b8f3bf94a94661aa120d3b0e9a3042e64bfb8f81a8731470417e436f52342b3a63ab4bb3144349ec9aa983cea9c5d4a4 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b
 EBUILD pandocfilters-1.4.2-r1.ebuild 413 BLAKE2B 01f3da985164860a54e1ae618978abf04c57aef3373dd9820791124a551c9b033e69aee086856991c0f67c944b7a9ef74f83a351a6214c488b42ced41ebcebe1 SHA512 4df88b12f39b9ee0862a244c22189cc71e4ac142683980311151c09444fc1bde0e95c1f2d8d772591850009df68a51ac9d600842b024f109cc6eb5a6b8d09f32
-EBUILD pandocfilters-1.4.2-r2.ebuild 417 BLAKE2B 307ad4323eaeea7db93b5fb5e64465f5b4840336899974ee1687b6ceeae6657d54dacf60ab9be2965c2ffbdec750e3bb6a93a093bb34404f3a3654d7edf2450f SHA512 afd06f26a3b7d8f91933f2c9e279a79431466ae15cb0b0ff45a5a2ce4c98e068dde03bcdd5d7f1e4f2c5364f51a0e3d6f4f890785537626c6acec7e9b5b4c775
-MISC metadata.xml 398 BLAKE2B 2c08c9bb2d07f4566c9ced1a87888d4482988acb2e4579d243aa776272050a0c8a95de5efd209163dbeb95b33327de59478c978343ce69472c2812cadd6adc41 SHA512 fa20fb0f6270246612d2f7a7cbde6052d3f27c5ad4e111deaf7a80ac7438fba8c4e48150be615053063197f7902243b12ad149b1d050fc281b71196d4b70daf4
+EBUILD pandocfilters-1.4.2-r2.ebuild 416 BLAKE2B f7d8b43c3af1817d1766a0ed357e5d162d9acc0715466df225407fd7d1fcad5a92fc466a6cd9a1b1beaf665310d7bc85504b2915c56165be7d0c6d8ab1ea849f SHA512 d3dd2e7aa27f68ed6b880b6712fd9727b173fb1fe20119497038ed90e1cce87e3a9e65540f1d1930ec1b710df271451be32627e51598f1a269081891341f9689
+MISC metadata.xml 505 BLAKE2B f15a208579a5dbc0a4552fcdb95eb47e454169bcd4596450e4ba40c016acf0c0718cfb1d7510c4d47d5964c4dd5bc38e9d67250355ef2c057b1d07e189ee6e03 SHA512 a70bcab9a4cf50dfb414d61844c258ee674c07f54fb63e238240f6ba75d9b9bac17f2c0008e09bf909a277da4501ce9f56ec66234216187497160c40fe90ade9
diff --git a/dev-python/pandocfilters/metadata.xml b/dev-python/pandocfilters/metadata.xml
index 18d97df8a656..504d616d1f0b 100644
--- a/dev-python/pandocfilters/metadata.xml
+++ b/dev-python/pandocfilters/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pandocfilters</remote-id>
     <remote-id type="github">jgm/pandocfilters</remote-id>
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
index 83ac64983570..f0ca1779097c 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index 0bad3ed6f6e4..fe92b30f966b 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -3,5 +3,5 @@ DIST parameterized-0.7.3.tar.gz 22678 BLAKE2B a0332af2bd8c955993bd9520538efced1c
 DIST parameterized-0.7.4.tar.gz 23389 BLAKE2B cc1ac334c0209a7471799587e1d35f6d8db84df91f559514bf3067ec8b2110948a6148613efd1d0111a65d43c52f7be16ab56cb69dca339fe7049f64484b7889 SHA512 71c51ad57900f5b1b6f4866c60ba4d23649df7740e7f7e735a2e0faf4810bc8dc552a1647da8c174f8a0b80db7de5727ce24dabc9fee6b4cfe12ee98c18945d7
 EBUILD parameterized-0.7.0.ebuild 578 BLAKE2B 3f191fa2d7a2cfbb0b654def88086d932c7bd0cc47c5e42768f43c8c04e55b36faf5f7ad68cbb025adbd5ad0981dad50a3768024495197e7f25ec3de074d5aa2 SHA512 6c92e567699a82d2c8fc1f857dd962c7692795171e6679b37a88fbdeedecf6112489ec627157221f60b82395b8c628189dbc6dd5a452feaf8382fdf9cbf888d8
 EBUILD parameterized-0.7.3.ebuild 417 BLAKE2B 554729276a8d12504841ada00a5386c08e427a6856eb65acc14074bf8d6e22fd4642c39f13853ad2466840c71d00871353c78e7ee3c69a64260aa5a368e4c09f SHA512 fc5fc89af92ddeb839ec9a21fe14b7f5a5f7027081c3032e006c9dd1d8266013ec12f54d2e4619d0edd7e790e7e6b2e35a82d3162212cce65afc4540b7c6ef87
-EBUILD parameterized-0.7.4.ebuild 417 BLAKE2B 554729276a8d12504841ada00a5386c08e427a6856eb65acc14074bf8d6e22fd4642c39f13853ad2466840c71d00871353c78e7ee3c69a64260aa5a368e4c09f SHA512 fc5fc89af92ddeb839ec9a21fe14b7f5a5f7027081c3032e006c9dd1d8266013ec12f54d2e4619d0edd7e790e7e6b2e35a82d3162212cce65afc4540b7c6ef87
+EBUILD parameterized-0.7.4.ebuild 416 BLAKE2B acf215fc68c23df5b53bb7ab7017a17907b0dffd9703952efd69096afd2f375b48f1c32dca88f53a823f29a76df50bd748d61d03acea3159cc4d51fccbfac65d SHA512 236ae742e49b52f0ca6dac4983d1b0cca57558d4e1b41790b542e686d8d21c8debb9fbfd577358c8d5f5f62bc4d0893c2f941d2335feeffc1849107cdeb11a1d
 MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 2fb854097678..31b1b638ad95 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 1fd89f71af5a..200fa5da6579 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.7.1-tests.patch 4618 BLAKE2B 9c1d055e24e360574fdcb63ef01a1669e380da42aa2ca72ba158159a1d618b447936a3c3f746625126a1bf8c945d8000bd09aabc5918d25b3840296b57bb5469 SHA512 6192dadd31c33ccf178cd813b726c5c2cc31a12ac7698377ede19d10b19b4e32b6e203ec2bbf26b486f58151f642c4d44095e9efeabad96e2751fa4631ee11c4
 DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
-EBUILD paramiko-2.7.1.ebuild 1417 BLAKE2B 2d5b5b788dd203bf8b94fcdcf4834effacea9d4c1a87b5463819c9e6e9928d2a3f2b7b5dd81624d832316e79f7074ab08e29593ac4bddfa6c90e96a71acd7700 SHA512 69a4f4244ba8ed18208f45efacda8f84abde3b46699ecacb96df8d2b08626572c70cc89b1fabfb74bfced85f1a67e2323d20c3cdfe80f6aa753787c25c69e0ba
+EBUILD paramiko-2.7.1.ebuild 1343 BLAKE2B 1927181f686232022c8a06a2d1033dcd0563c83ea5cbb8489827f83ea6f5c51ba6658c4017c66a95d762bac256051e9742929da69ef7e60f6fbf632749067004 SHA512 b7f64a23b0f6f22cd51ec6788129f559859763b11da2c83fd277e6260c3d4ab8c33beedb115cb27c0add06d7263a5eb2a6aff3c5fabbae1b7e8f90ba366c0321
 MISC metadata.xml 1331 BLAKE2B 4e53a314a1a86c488328a89170e03932bab1944bb133cd8551333da5a4cb80600e1bd5238b858bdc3565334cbc7251782979f4a770b43d064a9bb5096fdec7d7 SHA512 14cad597d85d0778ee8b2ce5c7cdda768e8f3cfb8de084189e7d0b422b77c73c2410448c8c013c1f03864e7b4365a87c1bba16fe49081f728c3bfef3d0ba455a
diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild
index 114317d36879..c2d84991da27 100644
--- a/dev-python/paramiko/paramiko-2.7.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -17,8 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${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 ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="examples server test"
-RESTRICT="!test? ( test )"
+IUSE="examples server"
 
 RDEPEND="
 	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
@@ -27,7 +26,6 @@ RDEPEND="
 	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/paramunittest/Manifest b/dev-python/paramunittest/Manifest
deleted file mode 100644
index 286931b09d25..000000000000
--- a/dev-python/paramunittest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ParamUnittest-0.2.tar.gz 2482 BLAKE2B 13d7de57fe0f3747fa5a8bdf2654a16b18c56d74545d05cfd8288fd902f43fec3c7c73d7528c1b3ada7e280e95b72855c14ac6e6d7419280197258eed2592a52 SHA512 ad39def15e5983ebe6b018b10f966b7f83085facccc50e71010f88b8bcfdb704e889ce021535b2e4dd84bc1ae413088e7c028990d934d4fe28d3186b4b01a3b7
-EBUILD paramunittest-0.2.ebuild 512 BLAKE2B cf8ccb64929037db72e86ab917a6b09b0268a08dbe2bd1452bb9f8eb43bdc7d5034b1f7e863ee1561f359a95a0f66f5b8a6c10d3ce1c64faae39d20cb9e78b4e SHA512 2e7e43c0e40cd119b77fbf74006e1ee9ef89d9a0fd2418c76c8500928addac323b65b1591a13aaabbff824f52a078649dbf0581b43719a3a4aac4e318c43300f
-MISC metadata.xml 299 BLAKE2B 63557ffe11e7306ee858e78150e1e9581505cbe9498b0bc4cf0e2113757c8d22518f4afdda9da0af358565c6a5aade3487bb3f443bc354906c621ecbc3327919 SHA512 b7bf38d24afab09b5d2da40d7ea77601ba094ad322f505cb5dab4991955e2799c2cdb33d0a5a387de6f2df6f0772020e1fb9cc7bbe74b3198077defbfb6f0b92
diff --git a/dev-python/paramunittest/metadata.xml b/dev-python/paramunittest/metadata.xml
deleted file mode 100644
index d4840cc0a39f..000000000000
--- a/dev-python/paramunittest/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">ParamUnittest</remote-id>
-		<remote-id type="github">rik0/ParamUnittest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/paramunittest/paramunittest-0.2.ebuild b/dev-python/paramunittest/paramunittest-0.2.ebuild
deleted file mode 100644
index c02fce856a0d..000000000000
--- a/dev-python/paramunittest/paramunittest-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=ParamUnittest
-
-DESCRIPTION="Simple extension to have parametrized unit tests."
-HOMEPAGE="https://github.com/rik0/ParamUnittest"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/parsley/Manifest b/dev-python/parsley/Manifest
deleted file mode 100644
index 82f4383e04c8..000000000000
--- a/dev-python/parsley/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST parsley-1.3.tar.gz 108574 BLAKE2B 4fb22ee0cf5e9115820bd8da76402c4915ac936b58e590097f44d788d6df99ad15779833ff8535e9256dc04a375e818a1e97a2ebc828cb343d002c27956b57c6 SHA512 da749592a585be6c7b45e3d0637e30f0cf79caf71f88cd55a9c53466f5adf9c46a955359b3587f37b8237a5005cda94f62ab349889cb649c786f593b3707dd55
-EBUILD parsley-1.3.ebuild 424 BLAKE2B 3cc34d6b813a4a46d67246a94319ed0c2bf15bdf067e2f962a392ef1915938d69b70f8f9f2029f6f56b2e78546a63778f27c6e56e186ed7650763475448fc719 SHA512 7cb03b50aafd5f5823c71c0c8170863e3adefa265f65c2b54129e4b4454523901732c7f5397af9db980f9cfc1a38e94baabac289db1b766b1bca8dc30aca3e6f
-MISC metadata.xml 259 BLAKE2B 1c1ccfbd9597e220cf99add6d11ae208387d4dadf7e9839f5054ca2a5c1f9e352da99d46c976a51caafdad98a7b067dc4bf725543621c4de7fd07f6eddbbadd5 SHA512 f0b022a8047e4d0fcbfb12f88ac7761c403cb33e7fcb900ec929e06d00251253426815b3293d072e13ab69b643c256554c753b62be63554d408c06f6a6d63a3e
diff --git a/dev-python/parsley/parsley-1.3.ebuild b/dev-python/parsley/parsley-1.3.ebuild
deleted file mode 100644
index 2fb1421ba039..000000000000
--- a/dev-python/parsley/parsley-1.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Pattern-Matching Language Based on OMeta and Python"
-HOMEPAGE="https://github.com/python-parsley/parsley"
-SRC_URI="https://github.com/python-${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index a0302d9187ec..01690bc48acb 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -5,5 +5,5 @@ DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84
 EBUILD parso-0.5.2.ebuild 740 BLAKE2B 58006962dc3210fc8f3e507c5d699f700ab60ae0655eeb59137d44981c6ad9b607507d8f76bc55be4db0cd7f97a347b5b46003a67cb453d0d75ee16a40da225f SHA512 0c641807ac7c7f87baa760d4fdb6e3825857835de9478a387e8c8edd7dacdaeee8fffde32e6644fc9d61c55612a37453c13af8febf9fe54e42e11047775771ed
 EBUILD parso-0.6.1.ebuild 789 BLAKE2B 6d2e677dcb103af8de97e28753b244067bd799db3baf04614b8d559284afa08f861294aa747ef7ac359400cde5d6d7e92a31672f09792dce3bbcbad4a52eff86 SHA512 f9f0805a8ce9538c1901a1772a1d7bda92ef68bd4fe2e04b273c6356dce2001103b76af7e89c05c04da10795d512add51f6780be083c0625d0e7464c06e54267
 EBUILD parso-0.6.2.ebuild 791 BLAKE2B ca877d9c7c064d69cf91d1df7669a500246e6d2c19bbafb735f25d914185ee8bc28fd8cdcb250f7503754de0dbcb4029f31a2d494f824406f0607022d94bb63b SHA512 ea7bb8306c569d8dd381b7e4f9e1f8baf9b9f29c5bcb6312d15899e8679d02492df6707eeb879b7614ba03461336904626a91f5fdc7b02c41fc1499bc98f22c7
-EBUILD parso-0.7.0.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
+EBUILD parso-0.7.0.ebuild 746 BLAKE2B 62762737bedbd2583bd4f271bcf705f99e278fb651fb45f7f06f287dc835ffe45592a13e59a0d14b563107730db046059ca415a4379a559c1e4e450646a8d239 SHA512 a7be9ba693c72949014a780130a949d99e7e2db5099c13d106fe8ea8279efe43490bb3dd0e19ce26e8a2cec834fa94784825ba1b6eb0ce80f62e8871519b377c
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.7.0.ebuild b/dev-python/parso/parso-0.7.0.ebuild
index d9dff2d95d49..a6d051a7085b 100644
--- a/dev-python/parso/parso-0.7.0.ebuild
+++ b/dev-python/parso/parso-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,9 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index db2a46451b7a..2272a2f16ba8 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,4 +1,3 @@
-AUX parver-0.2.1-gentoo-versioning.patch 771 BLAKE2B edeeb76368745ce85ca812c399fe919dea9da01b1ed8f9c4b5a151809c0610d59b9213d441fbf891ba15389c9c9caaa610509a213585481a2ecbf09de85c33a9 SHA512 d4d8cea17ec8aa6bc3a2e3855f2d1e85b2954290fe41a894dfdea8617afe87f1dc79e882b14db608d5b58f1df4129509b55f8aa64862d770d81fa07e59c53b34
 AUX parver-0.3-test.patch 1078 BLAKE2B d81c48c59ec2f744c70c8dfea7ff6133c652105e933f2de77e6c50c097da5038f3d753e809d2237cb840fe927986ce1cbfd2620c629346ed8f232d7d1770ebe6 SHA512 2d4a8eec787eee57be68d57f6b041e4ae4fb437767b02568b3aa258c8853461922dd7a963fde0be134dd8cbcd4578cf93ad8eba37ec55b26733cc3671984de69
 DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
 EBUILD parver-0.3.ebuild 892 BLAKE2B e1ebb523e895c6e94933cebc0569bd13804a9fe154a5220ff565801cb4b8a058a02f991375fd1b51ca6969b61e6bea28ce983651fb0f1aef72f58c195a80e5e2 SHA512 3a4c2dd56e0db206df68c5ff835dfbe64c949dc1cc17708f143145fd395cb4da1f5c05a3532df98e89ced7cf030998bc9aef9f9144f4f4da7f18339235da1dee
diff --git a/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch b/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch
deleted file mode 100644
index a2cae61afa46..000000000000
--- a/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c5c2492..8f5c8c7 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,9 +18,9 @@ LONG_DESC = open('README.rst', encoding='utf-8').read()
- 
- extras_require = {
-     'test': [
--        'pytest ~= 3.5',
--        'hypothesis ~= 3.56',
--        'pretend ~= 1.0',
-+        'pytest >= 3.5',
-+        'hypothesis >= 3.56',
-+        'pretend >= 1.0',
-     ],
-     'docstest': [
-         'doc8',
-@@ -49,9 +49,9 @@ setup(
-     packages=find_packages('src'),
-     package_dir={'': 'src'},
-     install_requires=[
--        'arpeggio ~= 1.7',
-+        'arpeggio >= 1.7',
-         'attrs >= 17.4.0',
--        'six ~= 1.9',
-+        'six >= 1.9',
-     ],
-     extras_require=extras_require,
-     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 2bd923a9f38d..ddad6603e750 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,6 +1,5 @@
-AUX passlib-1.7.1-tests.patch 1552 BLAKE2B 86cfedd409d6aff983c31ec33362577e5e353fa00fafed47927cec318d79d79fea75af80a283ef23b6453fb2da1bb5c46ae513b784e97941a8a45dfd4089bb26 SHA512 ccdf6814890e1c25b5eed9b2685ca2778fe155c3f7d75f2b76433a91785baa93b692aa6ee0f3a85b768f3b0189be185acce1e570961d28540d8f9dd12a81db7d
 AUX passlib-1.7.2-py39.patch 870 BLAKE2B 87781afb87427dd78c9040babdb2c3be9f8b14099bee1d1e0cbd0a1bc0deee56b0ba0f65adaa5a9bbd81fd998152661db5a602127a74e59bc1aa07d1ce1e1c46 SHA512 a77f51cad2c460abc41b99cf59c76f33c1a15a51b4237c968185dc46c11c6e4aa1dd866082df13cd9b34f7496c9750c276c18dab8ea08056200d125e3dccb324
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
-EBUILD passlib-1.7.2.ebuild 1019 BLAKE2B 02b96bfd68d6e1a1969e66688ceaca528f46e9489651ce5704c4b9653d7e2821abdc759791ee496bcbf6f40c220b87c8464f35940fcd1410b13f63cd8c7ed903 SHA512 ab0bfef4de8726aacab5a5901818ff7ae1ec0f4afd89e4939ffd84349d310aa1e4fa597e44c89f9470b7fbde073e10785d78dd533c8851cffb24876a21ce8b21
+EBUILD passlib-1.7.2.ebuild 1030 BLAKE2B 8188cff70bb46b853874d02d891cddb8e091bb501e509b96e8ce2b43f1846f9a61d19b772321868fb41ee10da2208b57d121128fb49966ba146ff9f25a94ef25 SHA512 a861ae15b973688dd4754955436318d406fc6edbd8d4b311124ed83849fdc4e53935a47e7135fdbfafd664d10b8f4a3eaecb405f7913ab6f319bb0189e1e5a1f
 MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
diff --git a/dev-python/passlib/files/passlib-1.7.1-tests.patch b/dev-python/passlib/files/passlib-1.7.1-tests.patch
deleted file mode 100644
index 697262fcd9b3..000000000000
--- a/dev-python/passlib/files/passlib-1.7.1-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Only in passlib-1.7.1.orig/passlib/tests: .utils.py.swp
-Only in passlib-1.7.1/passlib/tests: .utils.py.un~
-diff -ur passlib-1.7.1.orig/passlib/tests/utils.py passlib-1.7.1/passlib/tests/utils.py
---- passlib-1.7.1.orig/passlib/tests/utils.py	2019-11-19 21:39:07.373344777 -0800
-+++ passlib-1.7.1/passlib/tests/utils.py	2019-11-19 21:39:13.525351120 -0800
-@@ -16,6 +16,7 @@
- import tempfile
- import threading
- import time
-+import unittest
- from passlib.exc import PasslibHashWarning, PasslibConfigWarning
- from passlib.utils.compat import PY3, JYTHON
- import warnings
-@@ -3149,6 +3150,7 @@
-             self.assertRaises(MissingBackendError, self.do_genhash, 'stub', hash)
-             self.assertRaises(MissingBackendError, self.do_verify, 'stub', hash)
- 
-+    @unittest.skip("fails due to unexpected support on linux, probably out of date")
-     def test_82_crypt_support(self):
-         """test platform-specific crypt() support detection"""
-         # NOTE: this is mainly just a sanity check to ensure the runtime
-diff -ur passlib-1.7.1.orig/passlib/utils/__init__.py passlib-1.7.1/passlib/utils/__init__.py
---- passlib-1.7.1.orig/passlib/utils/__init__.py	2019-11-19 22:55:46.438000094 -0800
-+++ passlib-1.7.1/passlib/utils/__init__.py	2019-11-19 22:56:37.144958345 -0800
-@@ -903,7 +903,7 @@
- 
-         # the current time, to whatever precision os uses
-         time.time(),
--        time.clock(),
-+        tick(),
- 
-         # if urandom available, might as well mix some bytes in.
-         os.urandom(32).decode("latin-1") if has_urandom else 0,
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index da3cd45d5bee..1a5df3be3aab 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index d08de5b704f8..dfaeba1bfba9 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,5 +1,7 @@
 DIST Paste-3.2.3.tar.gz 628900 BLAKE2B 3f6bc741a716f33b82fa3bf8e1ab6ba3c17a56ebf3f90ccce0c1a925f982a2a0b460f433e15045321bb4b7c22c6fe9238cf6c7c76b78dc86d414729b67f0791e SHA512 8775a4c6b1863355a2acb3b88258e342db768942ccf28edc8654d7a1a15c5a036f4f8c5c9d917d51e74c9260170234f9c499cefd709b0fbd39ffd4d1b7afcb79
 DIST Paste-3.4.0.tar.gz 630425 BLAKE2B a361450597e8dce1d9cb99ce2a723cb8feb08909975662e1fbe8b353c20900ac5d994e8373ea4db42776aee1901f51363f8338ba4e3c35462f3c3917161a02ef SHA512 fbe0d1f39d8147846b3a30f18e6776c31eb5bcd8f461c0bf7afc35533c65c2ddf74263807be1b73b76c49cd6cc73c210a37ca651ef1f34e727ccf0687478085a
+DIST Paste-3.4.1.tar.gz 633491 BLAKE2B be599b9385ecad754fc431a936ccd78ee088825c88040986ddd4ccb3ca81342d642a23699ca7ef9338be5360703ce5d5a2d966ff9e405744b286fa3fe69bce41 SHA512 90b6bd33e83fde70691be6206ad1de653603900b88fade79f6960df22bb84c6e82c9b6f4ddc11406f4e206273a2b5591b81ca034f8f42a3e993b85b16d07e3f0
 EBUILD paste-3.2.3.ebuild 1746 BLAKE2B 21bc0c5925223b5f3a46166f048b061e7f69dfed80e540f5adf3103bb3cac0cc6b0c767088f7b984a985a46081fb6499de86b3252fdbe162ce60fc8cec6b81c3 SHA512 965981d5831e50d140e2783aa17d1b8be51d6e90d1dc88210f6b1f70f66fb6bb33fb37e71b87fae377e9c999fc5a321b0cb03aea6d6391941e7c722901f7f7f0
 EBUILD paste-3.4.0.ebuild 1113 BLAKE2B b5c4e17c21b8ddce564d868f7f372b82b847ffd20987e52ced41e69d8a354cff0fa3989f3c292c83c3e023553afe4f24d7f5c3e0bacacee255b7727934053fa8 SHA512 3b9ab839d8a7c5a09c3ed81b5807619885265008ec853652ed1c9363c671966a1ff9116d0880e365a890954201623691b7f4c56100610fc25f2b07c4f93c9bb1
+EBUILD paste-3.4.1.ebuild 1113 BLAKE2B b5c4e17c21b8ddce564d868f7f372b82b847ffd20987e52ced41e69d8a354cff0fa3989f3c292c83c3e023553afe4f24d7f5c3e0bacacee255b7727934053fa8 SHA512 3b9ab839d8a7c5a09c3ed81b5807619885265008ec853652ed1c9363c671966a1ff9116d0880e365a890954201623691b7f4c56100610fc25f2b07c4f93c9bb1
 MISC metadata.xml 802 BLAKE2B cb355da6c4b803a1777a5fdffe5c262d65d8580a0ac902a79ff3f631037ec16a8865969e5a9ea663c97960e5e52370a438b700148c9813bcb535c8385f588fb1 SHA512 44f4ded1a14298d020ca255a48d26d63cd2c1915e537c45718f630710caaa00453059bfe0f615bf3217db7d2b81fcbd419fc67e8b56ce6096c5844d53c6ab94c
diff --git a/dev-python/paste/paste-3.4.1.ebuild b/dev-python/paste/paste-3.4.1.ebuild
new file mode 100644
index 000000000000..a86c3a7bb14d
--- /dev/null
+++ b/dev-python/paste/paste-3.4.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="https://pypi.org/project/Paste/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# TODO: 'Address already in use'
+	sed -e 's:test_address_family_v4:_&:' \
+		-i tests/test_httpserver.py || die
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
deleted file mode 100644
index 38b2e759efaf..000000000000
--- a/dev-python/pastescript/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PasteScript-2.0.2.tar.gz 117521 BLAKE2B 2de72050ee7f5b7037b99f9661b5445e523607afc84a8846f0e5d9e89196e302627f552825ce0e4f821b7ed9ed2713c87d7b504a4e2abf092f1e8fa014c40c4b SHA512 2f093eb982972fed354219c75c2e008931cea553960cea8aaafbe57cde8556de5626e7eb9bb3b9b7328bad3b7d9899f11fc9773a65380396dae506e7531516de
-EBUILD pastescript-2.0.2-r1.ebuild 1278 BLAKE2B 083d617140c882e2d87c4fab4285c2d21fe636daa827f072415ed1f0820c457fad6e2c57584b9ada70b674e44377dafb7108a80b5b08623fbc5aa11488938249 SHA512 0d90f1d3117dc262116114eec3a40cb3c28c98a0dcd04de1a9c04e0e74a00a51e6cfdee62f49a0f2445924c8cdc58561227e74489ca3821cd8706c045654faea
-MISC metadata.xml 324 BLAKE2B ef67daa0f9e2595c0b35ed1b919c98129443d224c81a7ea6bd0ef919845339dd9cd45ea96ff4a4aa0176b24c61a57bc2cf8ee2f0c2d10386dbae1c904d5426ab SHA512 48a93ec635e32513438b44cb67bd7302c6bc55c72281d253ee4cd4b0a7d4c25ec61b028d861fa1acd2b40f22479fc0a1f726d3334c8a2970ad2b45729279ec47
diff --git a/dev-python/pastescript/metadata.xml b/dev-python/pastescript/metadata.xml
deleted file mode 100644
index f51d9da0abb6..000000000000
--- a/dev-python/pastescript/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-  <upstream>
-    <remote-id type="pypi">PasteScript</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
deleted file mode 100644
index 0984831efdba..000000000000
--- a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-MY_PN="PasteScript"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
-HOMEPAGE="https://pypi.org/project/PasteScript/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/namespace-paste[${PYTHON_USEDEP}]
-	>=dev-python/paste-1.3[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Tests are broken.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests -v -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		cd "${BUILD_DIR}"/sphinx/html || die
-		dohtml -r [a-z]* _static
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/patch/Manifest b/dev-python/patch/Manifest
deleted file mode 100644
index 9187575b1c2e..000000000000
--- a/dev-python/patch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST patch-1.16.zip 12809 BLAKE2B 43e751edd4a51a530968b6b7accf64e35f2886c55b9f0b7206d8f568b51937fcfb266a7b41df22bb9f05b4d2549782f6f5a64037dc8b3c4a075cd521b7ac3eca SHA512 563be07f0376e6ddcf7fa500006d57def4faa2d9fdbd5232afac625d17d9621787de60dc67f0895e1f54f1d5cf0920594ade0985f1dfb7796f131acc92cd7f0b
-EBUILD patch-1.16.ebuild 475 BLAKE2B 08f27cc9301786f0557250062d7aee388911224746890d50f5ad44a4be989a00134a68f8a0805f4a29f142888953a484c933b9d09f9f56c8d625076799d66bd8 SHA512 3211aa57f780c1f9256587fe772a157411e7dfeee5adedc9322dbd573f05ed124d05ff7c3b2ed13333554f3a9743be0b4a6dd5daff99edb099a0c58820ea232e
-MISC metadata.xml 382 BLAKE2B 1a7923939c7b122ec6c8ea4836c33f24cb7141e9e6d08d9ace99b917057b414e3d43e14b47a0ffee828c853a1442e498db5a81e636a979ceec3d6717c8bfc1c5 SHA512 997aea675440c86e710e01e3202e4e7d228860166ed568a5289f379461f3c4c9f088e1b31988ca052376acf3442a66908564692eb958455dd1c12ed59920acdc
diff --git a/dev-python/patch/metadata.xml b/dev-python/patch/metadata.xml
deleted file mode 100644
index 9c559b52821e..000000000000
--- a/dev-python/patch/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-  <upstream>
-    <remote-id type="github">techtonik/python-patch</remote-id>
-    <remote-id type="pypi">patch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/patch/patch-1.16.ebuild b/dev-python/patch/patch-1.16.ebuild
deleted file mode 100644
index 39bc477ae5c8..000000000000
--- a/dev-python/patch/patch-1.16.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to parse and apply unified diffs"
-HOMEPAGE="https://github.com/techtonik/python-patch/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 1d468502d452..fccf3162ce79 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
-EBUILD pathlib2-2.3.5.ebuild 902 BLAKE2B 9a955b4c1476c5be0a053b753ff60aa3f0a6cbec32ce2b90ba8bfc40e7beb15791abc6539def8ee9ea05d260a45d0d24990ec0fb2d6a90d0b421f94fb745d6b7 SHA512 affddf04601e994abb90c2c914256087c915b9f9d0a9b3ac13be2c85ea0a5ba5c49a531c908c619300d486c979545410a14e2d0d0ce7fe6069b5af8e5cabcc7b
+EBUILD pathlib2-2.3.5.ebuild 874 BLAKE2B f6fd8dede91994564486939df89cc118ebe35054cacaf5c9c57b3aeccd1abed2af73a10f17dd174343af1001b01aa152145ceff23b47f481417bf72c9a365108 SHA512 31c45b446688f690d2a8b393e1ac363ac87cd8bc20f2366f719faf185c9420c9a2224e9a7fc7a0d11e9dff85364a4a56b86e0a28374b09ba4121c5787a19a8c7
 MISC metadata.xml 463 BLAKE2B c5e8381d9902bc251a106ec336aa4981170fb7fedf69c4b71ddd884a7e9389d906fb9b51328b80bff434bd69f8103826783fc12f827b30866a1dec5405e63c98 SHA512 e00cb650f5e170feb4186dd440ee85e28ce345447b16264e323a50ec719b19c68bdfeb5c691d468045aa1c57df43e5b12e569b410ec04d39d2d6d1e1c61e2003
diff --git a/dev-python/pathlib2/pathlib2-2.3.5.ebuild b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
index fcfb7cdfd59b..5e1c8a7d6d3a 100644
--- a/dev-python/pathlib2/pathlib2-2.3.5.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
 
 inherit distutils-r1
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index a1e4c6fb29a0..111b2ab171d6 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,5 @@
 DIST pathspec-0.7.0.tar.gz 24306 BLAKE2B 4256a658de2160d3487281dcb5a488c804320ec5b0bd8e20fdaf51bef8fc90f4e7fb48c404ce43508633c23d866b41e7e13cfa3897929459b244e75401b84ca1 SHA512 3171d39405eb586945261b11781b966e0771649dd7caa8f8a5bbd26223a37931c17bd50a4706d603a637a10460e9b3730c21f0eff7dc92d7e73ae570641a900c
 DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
 EBUILD pathspec-0.7.0.ebuild 592 BLAKE2B 6af70c12c31fe864c19efa8ad8b519cd4dd201d86d81624c2617b1ee962cfc75a33aa2008aa1bd1ca2aa83bf9ab8de06188e1df6c6af2123d1477d8363f9cba9 SHA512 864e76e69b755c6cd91754947da270f77808c6bd2bc679fc712bd1759ef651f95b316ca4f0d1469b16318dc8a3b4af65bdea49469eea4e434830c3160e0e7942
-EBUILD pathspec-0.8.0.ebuild 548 BLAKE2B d3b1e0cfd4d95935fef9fd087574d62f619c12384f19e7a1ad956a6d3b6e1a4d4703441918a3255d110ccde1e569dd48a78d7bf72f64ed4c98b636fb3a612121 SHA512 dc99f636f8c385e24e59302878c51d8a940ef5ec83030085c290d526b9e6cf400d29d100402d69f3d6d7d70dd35bc30dbf21a26ae657af959e94b9fb9284f7d6
+EBUILD pathspec-0.8.0.ebuild 555 BLAKE2B f7a8350e4fab1e9bdc35e87a9a003d9eb05c905268c54c6ca3e92c13f6537703de2840e06ed79558c723b2170bb14a54e0f7d4312551a1e59a4c3473acf0fbe4 SHA512 b01b3d98a3e2aea29fd0c96f92db42c9b81bf30dcaec65c96ac7092b3096faf46143ffc3742a58c7aa36d9012ac6c4d1dd40e1dcb8a7ef6b37b3361101d5af0c
 MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
diff --git a/dev-python/pathspec/pathspec-0.8.0.ebuild b/dev-python/pathspec/pathspec-0.8.0.ebuild
index 6fc762977c55..0e06f11927d2 100644
--- a/dev-python/pathspec/pathspec-0.8.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index f4992c0e6244..f672c2bd6478 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,3 +1,3 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r3.ebuild 398 BLAKE2B 9725b53bc3e64ab30208e775213d2eef7d5ad1326ca1505bcc40246c99a4822da8bfc5a602cecd2c339d2d929007d518083d211f791e130a3637e94a1332213d SHA512 1901cc29d17d5375f1bd2ce4f8509646cbd120aed8d91a702cd127648fb95372d19f72b499e453555d4a9510f9aac1916967226aefd0d6af1e02b2507d7cae4b
+EBUILD pathtools-0.1.2-r3.ebuild 397 BLAKE2B c305d289cf9752e46535bbeffe91a517f3478e92856104e75255c2988a6aae9078fde68bbad5cdfe07f1d69f8b62dd4b63a83e9dd44f3cd92c3f31d03be2930a SHA512 5104d2f68a473890b3fdc1bff89c24bd15a3138fda3f53096b40f7aedadc685ea091fe97883c977a09a5a4f2e4232bee13e63fa7775883d81117987d2971f5aa
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
index c471e0304012..8752b31bb000 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6..9})
 
 inherit distutils-r1
 
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index f683e3dc7548..bbe24b00be79 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,3 +1,3 @@
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
-EBUILD patsy-0.5.1.ebuild 1125 BLAKE2B 61110d26999b94afbd4d643f2c8dd0d0a0563b7e4145df6d27c07b1b5002ff4cf645e386e9fbf8e0f98de0f6b9b6c137d233e987906d4270cc699a745da0e518 SHA512 d556f3a924bed7e1b5bfe8031e7da3ad9b2cab57631e97ab8970b2429ba77be4aa768e6ec875d34d3d2332c9254870695f6a78a97b4fc3a742b2747531814030
+EBUILD patsy-0.5.1.ebuild 927 BLAKE2B 31f455e275881efe10d14d6826f5a282a408679eafd99debbfbd2f72249dd86c64a7adae57e8fd1f8bf8ae6aca43b56ecf1dd07b41a5e3e3e46a0780cf4e0c47 SHA512 52ea024490a4b7536e382751c445c57f78109ad36ac8304eabc1248263725f1b44f0785998aeac80cdb86145564671e90b9c6d5fffe3aa01896a44392e2da19f
 MISC metadata.xml 568 BLAKE2B 198b70af00599da8c516753e5ec88fb4353a966a279e4e40db5b57a7bab57f0ec360ac70ebe4dc14b194b147520b0a8d6d35d2e73003c9c70bbbcc3c830b91aa SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index 7ae07545ef43..55fef3e05212 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,33 +13,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	"
+BDEPEND="
 	doc? (
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+		)"
+
+distutils_enable_tests nose
 
 python_compile_all() {
 	use doc && emake -C doc html
 }
 
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	use doc && HTML_DOCS=( doc/_build/html/. )
 	distutils-r1_python_install_all
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 7f7605cac7a4..e0871cdd9ef2 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -2,10 +2,12 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
+DIST pbr-5.4.5.tar.gz 120510 BLAKE2B f0f22a25e41820a0848aface6c241e38d8c4500d14ac3c8abf3d3b5f3f2d88680505d43f045589d700e9c07ade1643712274b156832246ca3f2050f44e4cda26 SHA512 b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654
 DIST pbr-wheel.patch 2781 BLAKE2B f36ac5bfe22e97dd93735581461f5ac79753543e0e03bcf569d95a3bfac70362c50af8bfc745e5d29ff07092e9669782ddaf3f8edd70501966c4d4682a5bfa33 SHA512 3c89eb9ea617da1d3e2eca3fadff6f5be9f55e4a258e1fbcdd221f3c0ec3cbfd13abe401bdfdb4b464baf74b8111e981f2dab4fb2839a4b52aee65212d1589f5
 EBUILD pbr-3.1.1.ebuild 2927 BLAKE2B eaffd31603285ff741a6d945150eb80676a04cce33fc0961dc02db01ccf6a3108d12c8afa75b03483cd1c81f003b1c3a5894d26bf892688721fe6261fef8f1c2 SHA512 4ec995f7ead626e759ce8064b3083ebed8cd44d0edf5533378f9f2f0dc9a84f6533f994d2243376c53bcc4f6490804462872c750b5aff13bc8a40d89032130cf
 EBUILD pbr-4.1.1.ebuild 2797 BLAKE2B 8d178fb9f0a69b22996ea2e40d5df70086ca35230a78656766ad72e7b83c55048fb9f2727868bf49b65473c6dd9c8adb848764b75a0137bd3b22963f62274bfe SHA512 545c0cf96bcfc74691eb804fb95ed6b266cd98ffbf97a15c8b5dc7f5da88f270cc7d8c4d12ab27a477488669c1abcabc08c2700dfe1fe9b1258213608390a268
 EBUILD pbr-4.2.0-r1.ebuild 2938 BLAKE2B f35461acfa86271528f8b5e69b18396bdd3684dd382271b75543a739453eec3e2f8ea9885810447a3b66051303dd4af8711298010a7c70eb9f82369c5e127f38 SHA512 1dff0573e0e793ac68aefb82cdb5680595ef50800706c2e7a6e76a11e9387d00f00ce20154c9705d6cd30f7e386a95fac93922e805b3d41a99caa4e3730e1fb8
 EBUILD pbr-4.2.0-r3.ebuild 3133 BLAKE2B 4c2757cacce58ed2466b58613934370998b4e9479d9a3a06e1326cb43e9b02d5171ea393b353c7a442b791d6c2259f7592dc129f3ddf3198f7896dad7dc5f5e3 SHA512 5e12308c218345aebfb66b6dbd8fde60617112a0194a743feeb8e437844de88893c1add6a6ab34ae86b291e679b14a931e9da59db274ab69d4ef02cbe2c6550a
-EBUILD pbr-5.1.1.ebuild 3156 BLAKE2B 3f65dde64174f83423ca890ebc6d13c04f943bb78923ea94fda6e99bce21af00b0b228b06d76b4bf7cbee9b0d845d1ba3bb9a30af7b664652d6745bf2ad5edea SHA512 396f2e3bb1f62372bf808b1bb43b10c05dd8bb4b2c7757859c0208b6738241c2873500c5fa73f9c9ade6ce77284aec0791b4c9f015c3c4e979f86ae601a48b9b
-MISC metadata.xml 711 BLAKE2B c5572087c31ce124b9ffcfcfc1042f0e484dd68f9b4ada35e25a7eaf0b98bcd1380a5bf14c364c28919a06ca5126af9ad83ae0eee3dc97af3d690faecab6e335 SHA512 196cef8eed603fa985d71e456afa5ff39ddd0967485ce9d7d1b6721ba706dec099890a30618de88aa5b1e31a31dfbdc84cf357ff52595a08f4a7f395fffe2738
+EBUILD pbr-5.1.1.ebuild 3158 BLAKE2B fc0a90d48b599a09a6608fe273727068f21c13b7bc69a811a804b17d75fe7f6d185955e3f892b2415c1df8ec3d0941988b9575e4f39f62755c2fc034b3dd8d77 SHA512 5782d5e43c411507efd73de8db18088922f8c732e1a717b98991abf425c5f1ff2e10cfc7175fa72367cd4275a41c0f77df37817b4ebfad767b44ee2c144ba2fd
+EBUILD pbr-5.4.5.ebuild 2506 BLAKE2B 3beff550f3349560c83a865c9b7b8b392b5a6172cd3b31699d3e54d09ecc6128e32764015f75f0e2623f0ad16a75ff92440b3c0d67e0c99a93a5575d3c9667e5 SHA512 1feee555396315cdc6d0fa1089d1f05ba7951b9434968d4a610e935070f158157d45cd909511e4cc8dbad78e7ca050250baae9f36b067e61602441c42cd07987
+MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/metadata.xml b/dev-python/pbr/metadata.xml
index a7f104aa2180..aa7c0d694563 100644
--- a/dev-python/pbr/metadata.xml
+++ b/dev-python/pbr/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     Python Build Reasonableness
   PBR is a library that injects some useful and sensible default behaviors into your setuptools run.
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index fb80809cec07..2442fec934db 100644
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
diff --git a/dev-python/pbr/pbr-5.4.5.ebuild b/dev-python/pbr/pbr-5.4.5.ebuild
new file mode 100644
index 000000000000..26c449ed139f
--- /dev/null
+++ b/dev-python/pbr/pbr-5.4.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			<dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			>=dev-python/stestr-2.1.0
+			dev-vcs/git
+		' -3)
+	)"
+PDEPEND=""
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# TODO: investigate
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-i pbr/tests/test_core.py || die
+	# broken on pypy3
+	# https://bugs.launchpad.net/pbr/+bug/1881479
+	sed -e 's:test_generates_c_extensions:_&:' \
+		-i pbr/tests/test_packaging.py || die
+	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if ! python_is_python3; then
+		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
+		ewarn "Please run tests manually."
+		return
+	fi
+
+	distutils_install_for_testing
+	local -x PATH=${TEST_DIR}/scripts:${PATH}
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	stestr run || die "stestr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index d7270e76f484..988114f959e5 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,5 +1,5 @@
 DIST Pebble-4.5.2.tar.gz 23719 BLAKE2B 62db1c273ca0d27ecd16a7dc2508d288ff95ed7f0f123d58e345fcf1d48eb17fd829f963be53e63b377c765548769654d695322e7ee8c8a13369b0e74eba0eb8 SHA512 83391dc29c98615e1308dff9e4619471c7407c2981421b00e77155042d41f4a19c819c2ba32103929333d71621be47fa2eb5fd9f36ae7580379789b2c870e59b
 DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
 EBUILD pebble-4.5.2.ebuild 501 BLAKE2B ec552afb3ed8f214ece0f957a302e58e5b4fbccf7c826b1cb473b5710d6de4f487bcc135bba0c2994e717d22d4d018f6d4af577ae5833ba0b74fe803eb285021 SHA512 bd524b376f44790712d703c855641da169d74ea8ba3745d00c6e65e4d15bde02412923c5b6cf53af8b907d8b52a32f64d0a38af4a8752d0027e2f492d345993a
-EBUILD pebble-4.5.3.ebuild 501 BLAKE2B ec552afb3ed8f214ece0f957a302e58e5b4fbccf7c826b1cb473b5710d6de4f487bcc135bba0c2994e717d22d4d018f6d4af577ae5833ba0b74fe803eb285021 SHA512 bd524b376f44790712d703c855641da169d74ea8ba3745d00c6e65e4d15bde02412923c5b6cf53af8b907d8b52a32f64d0a38af4a8752d0027e2f492d345993a
+EBUILD pebble-4.5.3.ebuild 507 BLAKE2B 418dcc35d202e93a4c25f5d0e4b94d723ba0b16e669b11df9b7c353ebcc87748ad8fb25d1eb3bf8b9a069d36e650ce57f25a734ba3eb68fea10bed4ee7b4d914 SHA512 404a5eaeee9487d4774d0e47736373f7a17516f21d01be0abc76367c280014e5ffab3d067c5f6f898512eb2ec40e617742aadcc18bed15c6c6012abc03de34cf
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pebble/pebble-4.5.3.ebuild b/dev-python/pebble/pebble-4.5.3.ebuild
index 23b80b0f697b..85f87286314e 100644
--- a/dev-python/pebble/pebble-4.5.3.ebuild
+++ b/dev-python/pebble/pebble-4.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_P=${P^}
@@ -17,6 +17,6 @@ S=${WORKDIR}/${P^}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pgpdump/Manifest b/dev-python/pgpdump/Manifest
deleted file mode 100644
index 30efa1f9ed90..000000000000
--- a/dev-python/pgpdump/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pgpdump-1.5.tar.gz 69446 BLAKE2B cdca875f3d827d8c1a35164465c158fb211677457c29924a6bf1cc7d901c1e732ebbe57edc819ddac0ded186495d307010d0180b4d115977dd0c68f254fc9e45 SHA512 b9fc7f78b920296301acaad2dbbafefff7b5f1658cbb65f5892a28d0b4d5110581bba984ad5cdabde3330025e3828387d7127c689cb86a7163c0b5ac0d0d2de0
-EBUILD pgpdump-1.5.ebuild 424 BLAKE2B 05cc128eecf346b3b386a32425fa40685ffe61dba2b32fb7c99d6e7c48991563c9604e593ff8ba6dafbe82fdfa67fae088c131a31c63dec570cc369f909e181a SHA512 96c0452f364614d94d384a4e86f602279b28faa0e3f1f93e1affc914faba9703d9f77adebc154ceed1eb516a208b96acd4db55e4bc9b17c0215c477ad6d5422e
-MISC metadata.xml 386 BLAKE2B d999fd34acffdce83998229fd30d7bb5cf8848601c43341ae1a5c2b7028991bb8af59f69ccd04f4c6284be6e97ff99cbc4841f333b0dab75e7fbb5fea844e541 SHA512 e7d8886a19a4cae8c44a9546ca41c486965a304da55d623892746d1dd0706348dbd431080ff145bd47d7a629b1e7c464e36f18699172689907c15fd31f79fe27
diff --git a/dev-python/pgpdump/metadata.xml b/dev-python/pgpdump/metadata.xml
deleted file mode 100644
index 11bf83b1dfc2..000000000000
--- a/dev-python/pgpdump/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-  <upstream>
-    <remote-id type="pypi">pgpdump</remote-id>
-    <remote-id type="github">toofishes/python-pgpdump</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 04fb09d7f8df..dae6a7b2994d 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -2,6 +2,6 @@ DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab9717
 DIST phonenumbers-8.12.2.tar.gz 2397674 BLAKE2B 8101aa4e42d53d9c4734f0e3e1085ba814d75b53228a5da3efd7310faa0c5e0da419b5a9f127e4ed2554fa06db5007ec7eb430800ec7cbde69c3c8944e45a99f SHA512 16b8562afe94fb14104c266b12db063cf6c9dbda9ae2301a044cfb2e708845f1857b5ecb986e409c67c16e2fb7e4df527906c4d43c302e14df698607deb078a3
 DIST phonenumbers-8.12.4.tar.gz 2269009 BLAKE2B 102630893595fa34f8e5bf3dc5122f43393e26ada216df02e843a40345aa40df83aa6fbf115d71e986a7e57e6a55bd6fd4eb4af14c4872bfe717cb0ec5be604c SHA512 5d93de2b7b6e974593659fb8909c05f2f6f8c29766deea914472b01dde38abdfc9f4f6ee8c718e2ad11e840070b350b623cb9ca58368f24cf1e03804712fa38d
 EBUILD phonenumbers-8.10.22.ebuild 523 BLAKE2B 24eeb05726d2f9d849644b6af229762cf037129e27132d4dc364e47e6651ffb4520a41ff4b488ed2611a989fdf8dbdf3ad1261ea9e4d83f400edeea563b672fa SHA512 0411af8491522b28a005405181c384b8133bbe2c944600faa6c0d41f4652abda346635f30f3dbbe6b39f94eabb33abc686eaa3b2fb59c7b6c5e99e3bab8f865f
-EBUILD phonenumbers-8.12.2.ebuild 526 BLAKE2B d7f518932e132e6a6e0f2d6cf8aa4a8392b61c0ec46c23aabd64b389bb76a87692bb65da46c3cfe58d1dc2f2ce52b43ed83d485df7ce1a30dcb26d68ec578efb SHA512 b2c8842bb74f9ce6da75ea597f1df497de6b73002a089a17455954830339f04da5d23b0b415259354a7395004a154519d23f8957f5e7f7387a9a0de41237b954
+EBUILD phonenumbers-8.12.2.ebuild 524 BLAKE2B a9a7d4c6f0046715d87196a67d8bcebeb4f97235d084adb01f48bf5b2cd6d6d34046c2bfd351c891da4951f04b692598f9b70bd856d77f3a7490da8bfbf0b6f6 SHA512 c493ec11d4b19df796fa5b33d099ddec6ffdf4965d1cb8da4e203470d44c5070fd8ad46f3ec8771730a391f970d702e883397eabac5b36fca5ef54dddf98f91b
 EBUILD phonenumbers-8.12.4.ebuild 526 BLAKE2B d7f518932e132e6a6e0f2d6cf8aa4a8392b61c0ec46c23aabd64b389bb76a87692bb65da46c3cfe58d1dc2f2ce52b43ed83d485df7ce1a30dcb26d68ec578efb SHA512 b2c8842bb74f9ce6da75ea597f1df497de6b73002a089a17455954830339f04da5d23b0b415259354a7395004a154519d23f8957f5e7f7387a9a0de41237b954
 MISC metadata.xml 392 BLAKE2B 132a6d6143f7bdcca65dc93f90077577d9ea472aa6f2b107224f60a07c047e7e93a6fc9e9686e61d78299a0776487171e177c5fc3f6c85be74e29e1cd1132b22 SHA512 a610d3e2399621a5d222ae3de92108698785b077edc4bc969930fb60f6ba2364f6795538c6647fe46cf21c599ef00ecbab3458d45fb1d5f849e127c06f0b5634
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
index 3665d14f2c2a..ddeb720dd441 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index b9afba9bfa71..c60ed43edf13 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
 DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
 EBUILD pickleshare-0.7.4-r1.ebuild 600 BLAKE2B 7599d87ae92adbac63830f4e934c89e5efbf4af2bf407b80da276bd5a217fa91bbd201867aa117c63dd27c105e8d3051af7dabbab54dbb3fb94342e77019db35 SHA512 89567d792397942c02c41d538ba8af933794f5d16d5809d64702223de6b379451c2c1d4946d656f02e83dbe99819bf68b4eaca37c5f1acd1fadec1547347b17f
-EBUILD pickleshare-0.7.5.ebuild 614 BLAKE2B 223181ad799df57ebe176e9df991a1b5c328cf90c627d9d08a7d102638b490392cd0c817a804355e9f1df5d4dbec2f9ba32e03b9939c5d134d455f181c5dadab SHA512 0f435597671bafef7bb2e6f01941f3704df5c715d5ce3af61a4195389a6dacc252a6f45e8f521d34a4a36a060a8b3b4727e481d4a28381082bc8af9eb8f18b8d
-MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
+EBUILD pickleshare-0.7.5.ebuild 498 BLAKE2B dc184d4b69d0fac1fd46bae93ca3aca4294458fd12db6404c5a25d62a784dbcdfd775614a2a13b21b94f6751900df0e4ba87bc881db9063b5307f2a80c31c906 SHA512 5fc2ee872627ae0b84c9c7d09bbade62c41e6afabf4cd1da5a56dcddddf0ffe4ffdedda4faf63210bdf360ad0fe8a456234a5bc9b471c2ba1aa5dfa2db89f6cd
+MISC metadata.xml 969 BLAKE2B 7bbecd2168cada8eeb3db63f3b7799e0ea6b87ad9c8d976a16f731102079b5e57e83d420a05a7ad7824316b2af96a89d16308bf3f7260bd8063978186d95f495 SHA512 331d094592a66da7b84c3361dcd88455897a6d77385f82b42521980fac07d2b5e86937df52cdfcf39b29c4be779e8d9ca81f2523607ec88573a176b368914f1f
diff --git a/dev-python/pickleshare/metadata.xml b/dev-python/pickleshare/metadata.xml
index 5d8abb4a3532..f433b9658f42 100644
--- a/dev-python/pickleshare/metadata.xml
+++ b/dev-python/pickleshare/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     Like shelve, a PickleShareDB object acts like a normal dictionary.
     Unlike shelve, many processes can access the database
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index fcc022d87e7c..b4bc30076a5a 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="A small 'shelve' like datastore with concurrency support"
@@ -11,16 +11,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
 
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 1a9e3c7d6c6e..e31af55a0f7b 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,7 +1,7 @@
 DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
 DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
 DIST pillow-7.1.2.tar.gz 38933761 BLAKE2B b1d8cedeb0e8108af3bc5de672bcf812cb2f5ef8a9a23db45b3d5fc9d383d7d534ee63fbfce27f9ee4318982dec46e1e60eb55ce5aa14588b1468792c8188f5b SHA512 4e20f6dbc3c9d138de6270b14e85911ac5d2953328be4fd4b0754d8fe834625f914ee1f1b2f32cfb26ab57b6ea4b74d14a81a65938cbb94895c0afcd639bb38f
-EBUILD pillow-6.2.2.ebuild 2649 BLAKE2B 3f233472f98f78aa279a770dacbf9e3456b640f9284d96a5b347f60a0d3734358661e1f3a3ac444cc69d8da1a139444a9228b8cd85c434e0131e1f529e304792 SHA512 a45903c4d2c67be2e10c6c22e8722793d8e12953ad0061d3f4c8b63402d16025cba26410b1407ef7ab21ae7cd9b9f6281e79560b6f106bd19e9349e3f4ef4c5b
-EBUILD pillow-7.0.0.ebuild 2639 BLAKE2B 60656a534caaae9acd435f0fb1214883ba2f4e7034439e4d4cbbf50f4629041e70ee32614c9f6e7b16f96fe397d35801eb35c600ceb091007e7c7b4d9c11512d SHA512 c893374b60712853ad19c420658c34ae4147883d6788d3aecd52b82563cbe876b25a1e2ea893d6cc51d71b07de6883fa292366565291f23884b696f50e674957
-EBUILD pillow-7.1.2.ebuild 2696 BLAKE2B 882aed2dc93b5491d88976f262f3e6fc140316201066f5e9e52062a4fe3d32a24bf5da2ed05e7ceeba1131b4c00ac3103cc781f34ae3da8af74478b238de7e04 SHA512 7f30e4a72e2abe361f9729b634572cb9b4ea2ebce614b4215f6643d579404745311f378db4fa48548bd4c971544707d90b4349528969ac90ef82b6fa7124df9f
+EBUILD pillow-6.2.2.ebuild 2648 BLAKE2B 759c37375cc6e360927e58a039a3d10f4b36e177553e05993cf685ec001015d956599c1a8fd6d94cce86522cfe0f8016b0fc7c9e35b90f42ab35d6c902a1609a SHA512 ad0aafc5257de131825fffe2aa8f18be67207ab7282f27a9b443f7db457e9a4f913fc5d4ee71f5ea141b96c5250e9479f85ec36de3f6cab0593935a1ce7ccf98
+EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
+EBUILD pillow-7.1.2.ebuild 2695 BLAKE2B d2e93f51da0552a9fb7a2dcef8e218630ebea076b8185438f084bf77cf114293719306d9420d3f7ad6cbc0041cae19b69634350c8ea9b449aae0a1bfb7b89a60 SHA512 b4a06873c4c33143cc7f608b5ec8e3ee84f1dcb7571cff4631e2839b59ca19885fa036b0f6e72f54edc49130d64b1d2c402c2deca3935d78ab15b89c11bc4ae2
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-6.2.2.ebuild b/dev-python/pillow/pillow-6.2.2.ebuild
index a53a7f73a727..5b6d940f6f8f 100644
--- a/dev-python/pillow/pillow-6.2.2.ebuild
+++ b/dev-python/pillow/pillow-6.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
diff --git a/dev-python/pillow/pillow-7.0.0.ebuild b/dev-python/pillow/pillow-7.0.0.ebuild
index c7ad6f549790..245bb9d30ce5 100644
--- a/dev-python/pillow/pillow-7.0.0.ebuild
+++ b/dev-python/pillow/pillow-7.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
diff --git a/dev-python/pillow/pillow-7.1.2.ebuild b/dev-python/pillow/pillow-7.1.2.ebuild
index 43f8084cc1ee..71526b251ea9 100644
--- a/dev-python/pillow/pillow-7.1.2.ebuild
+++ b/dev-python/pillow/pillow-7.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
diff --git a/dev-python/pillowfight/Manifest b/dev-python/pillowfight/Manifest
deleted file mode 100644
index 981da6307b51..000000000000
--- a/dev-python/pillowfight/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pillowfight-0.2.tar.gz 2628 BLAKE2B c0bc947b679a5372e3af722a3d2cab97b0fb97a245f6319c7ff10cbfa5409fc7c2f325b7f65fdedbbdcc2ad2bfff8d426c3f8691a24be77760eb427cabcb0c40 SHA512 2eff2fd0bdf5c02513ddb4838675e7b9f392135ff08a784ca2fedf06c5b96a56af75460559066cc6cded65f3d4da087ac679492b7b1dba23fb557e6ac3565e6e
-EBUILD pillowfight-0.2.ebuild 520 BLAKE2B 0b118800e052f582099f3a68f896030040313d572c200b21ceddaacc819a8cac96f3e6b18a139baa36619cf83efe1b5b73523348e8dd45ca332641a6611c72dc SHA512 ea7e81cad14cb5680f2c9cf206a1c3cd2491475fa03d85a29d9ca2dad65fbc5072ef111b77c5413614f984a87aeb8781956ea229f0546ac92ac314df3ba1773d
-MISC metadata.xml 388 BLAKE2B 2679d6d0ca4a4c6f78a35498cd13379bc0b065643ce29205f35b66a31bea52fd5986c58225acce1bb1f27e132fcc6897058f0d0dfef1b5a123bfa3c398dbc710 SHA512 63a6f23df5433c9c251cb2ef9d4a2f88a1eeaf390b88b74ed8e80468b81de9537fdcbfa9d8a62109167900ed72cd503de495283d84e1b5fd22892538e2723950
diff --git a/dev-python/pillowfight/metadata.xml b/dev-python/pillowfight/metadata.xml
deleted file mode 100644
index 0916aa813f42..000000000000
--- a/dev-python/pillowfight/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-  <upstream>
-    <remote-id type="github">beanbaginc/pillowfight</remote-id>
-    <remote-id type="pypi">pillowfight</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pillowfight/pillowfight-0.2.ebuild b/dev-python/pillowfight/pillowfight-0.2.ebuild
deleted file mode 100644
index 40b647ae018d..000000000000
--- a/dev-python/pillowfight/pillowfight-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Eases the transition from PIL to Pillow"
-HOMEPAGE="https://pypi.org/project/pillowfight/ https://github.com/beanbaginc/pillowfight"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 221f48504a79..738a1a7179c9 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -14,9 +14,9 @@ DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bf
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-19.3.1-r2.ebuild 3915 BLAKE2B 62b2cac9e9c63dadf2ed8210cb975f0b39d5a7b1afa21a613d30f372638e399dedd9cc7a088bea650ca0f1a66388097b1566126501614e9d096724769da541d9 SHA512 2d23168da12f9488b7f7716f00ba85c0e6c8831d81dfaa6791f633f9470fbb6836d5836b7fba78b3902daa22c65330ed4b0c7b721a44faf4c3bed9ebf8441389
-EBUILD pip-20.0.2.ebuild 3977 BLAKE2B 16d06a0760d6c94f314956d84bd6f44cc63b8f56f0fce5f9bfa47ae7e16f6e82f48763c1408e6378a5b413a09488a480c85d43156bcc0c39446afd63d789c417 SHA512 a5ecb916edfe90a4b5e6749e4705a0ff5067c9ebd63069581845a4b2bb81c2bd50da4246e67a8e3b16e3c371e90e20181c4c1bb0c776f5b9be49b65a80bda941
-EBUILD pip-20.1.1.ebuild 4129 BLAKE2B d97176d95c9857a5147506fa0995177dbe92aeb2ba13939597359967924cfe53d522ada529f83a2dd5f7b2b63559c1651ef351b87684667edfeb3e2ab730e760 SHA512 c1ac80472de26643bc5d4b70d1057d7e6de31ac3c6d3fcfd26d085701bb24cf4d5d9bf382e9c299a5520259d8a4bd8e739d10bc15e594a152919ed0df61564a8
-EBUILD pip-20.1.ebuild 4064 BLAKE2B e9726ae69afe2c7c3cf38fcbe75b14a2cd70d8e681d14e1f46a5d40324a5f60167693c40cf1c67bf97c32ef08abd789fac20f1f49c121355d2648e7fc1deae23 SHA512 9b624db37a21464965f8e848257decbd8a827ac85e347cb5b1d409e4b8490d9257d45720a0aeeea6891327884f44b18a1d0f1ec01abbbf07e7aa85fef87901bb
+EBUILD pip-19.3.1-r2.ebuild 3968 BLAKE2B 6c0e2c5daeee3afa0c575e0f3a54600bd16f5bef748800a17fa05f444818e3fdb28a9825f1c89d0052a01555ebc623fb8c1f16f74cfef5fed1085ea3bd1dedb1 SHA512 8202150be54533c2420909fc339c2c53b8ddd93733cbfd9b9070034bbef2ea02335ca519f15d39a1e6e77de39a17833fde7c92b765edffde270eff56bd3d16a1
+EBUILD pip-20.0.2.ebuild 4029 BLAKE2B 65fdcd0369790dc039c2f66d9d0a1723a9f90c5e57692e5e53d54121949a09a783c69e26ea506f9fabf3bf2bc00fccef9e9991db6538e8f7171e714123a96af5 SHA512 61b0ec7258af40912350698ec237429aad215e6b776337637bc309935c6f6ff02b9af61b6df8d5107c38a58590d0df0723743b3da002641a57d82796ae3061f2
+EBUILD pip-20.1.1.ebuild 4159 BLAKE2B 35aa594ade5d4af7c460bd1f6ef358ff580ed9dcd89624573e2d81487b9c4da4e16024774a6efd74f1a463b0685532a764bff599802ec92add8ee2388695b01e SHA512 1de3aa6d9a5136297b7564c3d9ac0c88692ddd9f67f540b4022ecb53069b6b668449bd55cd64db257572d8e1c2221f52a8f4eb422fc7074924ebfb13d4578c79
+EBUILD pip-20.1.ebuild 4111 BLAKE2B a5f9d7975ab43e27a5a8a4c1359702809137989c57f9f7ac318323d01f6b8c47af58bd8eb3437a0be9b60b0c028917216196fbfb9ef8b68239a3425bf0a2d61f SHA512 938e39e722e149e12d853da0e023219caca3d2c936555e92a34645e3d378a37af6546f553c0fe6b2653e5ee3990ae5ca7fc3008c3de6e67877e53f800ee536f4
 EBUILD pip-9.0.1-r2.ebuild 2454 BLAKE2B 7d6eba7ecf7279234a820a90edf51e2c2aceecd06ae212e1fda4912fa8a265c8217c27c90bb0f6e112fd53f766dc4e926371f11408d20f41004a60e24ee83a46 SHA512 5fd2425d32692d483814dd03f80ba634f2612e3e5fe1ffe8d043d717064483eaf01b76b053e383dd34bcf1bd2792346d0ed1648461f9414093dd082c13b61d88
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
index 4336e61dd876..17ca2852b9eb 100644
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ b/dev-python/pip/pip-19.3.1-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="amd64 arm64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~hppa ~sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
@@ -54,6 +54,7 @@ python_prepare_all() {
 
 		# these are from upstream git
 		"${FILESDIR}/pip-19.3.1-network-tests.patch"
+		"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
 	)
 	if ! use vanilla; then
 		PATCHES+=( "${FILESDIR}/pip-19.3.1-r2-disable-system-install.patch" )
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index 97704d0af514..fa155d4b02da 100644
--- a/dev-python/pip/pip-20.0.2.ebuild
+++ b/dev-python/pip/pip-20.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
@@ -54,6 +54,7 @@ DEPEND="
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
+		"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
 	)
 	if ! use vanilla; then
 		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index a366f439a2e4..c6e2c880ab95 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.1.ebuild b/dev-python/pip/pip-20.1.ebuild
index 99ae4f7dca16..9da532f79f0e 100644
--- a/dev-python/pip/pip-20.1.ebuild
+++ b/dev-python/pip/pip-20.1.ebuild
@@ -56,6 +56,7 @@ DEPEND="
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
+		"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
 	)
 	if ! use vanilla; then
 		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index 552203ec032a..8bcbeeaf6643 100644
--- a/dev-python/pipfile/Manifest
+++ b/dev-python/pipfile/Manifest
@@ -1,3 +1,3 @@
 DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
-EBUILD pipfile-0.0.2.ebuild 695 BLAKE2B 38d01379fd30a6ca08bce5871c6f9777f3003df263d3de0f0bf086febccf001188621fe0e15944082c6ccec6dfb79838d70d1a9cfa961b7ac8be8dd458cfa1d6 SHA512 75cf721d2bf700f8b7cfe0cbe8a05998b64019a45a6803787bc77e7f5f9b9fe738357a6d139426a26aa9e09510e119536f2b6117052a1e3eebdf34303fb121ef
+EBUILD pipfile-0.0.2.ebuild 697 BLAKE2B 4c30b7fb412be74281e09672d67a952bdfd4bc2062bc15fd94fd14c6a924ecffb9f5b1d75147be77de9908eee545104fa983aaeae30fdf76e9baba603ce31a78 SHA512 1ce2151461e2b575e6a837e34f68b114e7dc2b573f1b59b02f8d7ad24d5a0d016712c038cf5cae5081862af30f97a25ac72fb69643097cf202d1f8d54299c9a4
 MISC metadata.xml 374 BLAKE2B 33a0b13410d7700b88daa529d089d32088b734da535af09b4b721017fad386338323207c58d94d517762f617d1d73a8e4bec44a5fcfb503ec8af83a65427e047 SHA512 7469685c63c03c2dd25a114bec9c2c3c8531858e45bc880f5cdc6066a9c22a7ca73d1be0d8ffbc5eabf3ca28ed80f17d18f4eaf86bb54ddd888a1fbcde53a49f
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index a1e774fec970..2072a52b284f 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 82320062bba4..a7a563b55061 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,3 @@
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
-EBUILD pkginfo-1.5.0.1.ebuild 712 BLAKE2B e3e285d532060820111777a6c1816ad91f6981a2f9f50fd9ed0df4677d97fc99b396db501e5277ecd1e7a0fb70c241ad331ccb80041669659b8e42cf8c919074 SHA512 5b38d641eb7f951262be38175dcc35d1e1a9b3b45711e42e02f9f3b3493d31f6f539337a0d3cd667cd13cb6de176f3255b92177e87ea4af6269cc1e76e40b244
+EBUILD pkginfo-1.5.0.1.ebuild 718 BLAKE2B 912b22b2482fa013dfd5fe06cdf428bffd1a89e64f4ce6282cc0d3894cfbdee6d81d6a7c85e98722b116158eddddb98486ce6cd90f27546505bdea05bdf1e365 SHA512 41b9db5fb9c9778efb723bb3a20dad8a076bded5af542b32e715e9dcc546f1373b9c7b76bf5b2d906dd64ffa994a7a05b39fe2d7f39d8ef7a18cbb8899b0eb26
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index ef84c07b7197..056ef7dd0558 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.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 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/placefinder/Manifest b/dev-python/placefinder/Manifest
deleted file mode 100644
index 4fb769bcf60b..000000000000
--- a/dev-python/placefinder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST placefinder-0.3.tar.gz 2632 BLAKE2B 26aaa5ad6ae0090d909841be4793df2cb632c83531873f3e98ee30d62543c27bb8bc61abc86077146c904cac4782bd05c715ee8f191c8d307a70e38fccf68f3d SHA512 dcff0ec0e6a1ca361a726bd5996095855d289f0780238aa0371835821294799f13c49919e0966495a9f77b5ea18b3be9deb5d2b5efd6ce0cf8803f13e22f6249
-EBUILD placefinder-0.3.ebuild 455 BLAKE2B d8e741992ccdf1f4992166f5c10e6c0a864458323463067fdb5c16cb310d9f5b8de7e0c37a30372a964a6b1554f53113f253ca0ede6577e8f38d8834dac9d4f6 SHA512 8fc113d94693d1487bfe8853f90af5de617151f2c1cf08162092ecdbb12b825e4189fdf0b341ecd27d99d83972b4f311e7fdb145e9138815fd0ba65f42d25cf8
-MISC metadata.xml 395 BLAKE2B 7b747923612d66d63dcc424fb5797e14e54cc098e0a032353aca6fc6357b14a849a53feb57b8df8fd8a49778ec5452114810b0a01b960ad36c5b6bc045c97deb SHA512 90d623c763dd2b3948ee444bb88221ca64b38b5af8379dafcaa0f267c4a89cc6620f8efebadbd414be8258a5d21cf437b3b4aef263d9e059b155b7001b7878cf
diff --git a/dev-python/placefinder/metadata.xml b/dev-python/placefinder/metadata.xml
deleted file mode 100644
index ce4fb677f565..000000000000
--- a/dev-python/placefinder/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-  <upstream>
-    <remote-id type="pypi">placefinder-py</remote-id>
-    <remote-id type="github">adampresley/placefinder-py</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/placefinder/placefinder-0.3.ebuild b/dev-python/placefinder/placefinder-0.3.ebuild
deleted file mode 100644
index 97a3ca1e6fc8..000000000000
--- a/dev-python/placefinder/placefinder-0.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="${PN}"-py
-
-DESCRIPTION="Yahoo! BOSS PlaceFinder Python Client"
-HOMEPAGE=" https://github.com/adampresley/placefinder-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index 920e0613f893..b559a6180f5e 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,3 +1,5 @@
 DIST pluginbase-0.5.tar.gz 41964 BLAKE2B 84fc187b60182f100a9016ac663856b29587e60b5ef5ac9c51fb4ed99666908a77c9817c2dc5fb64e82b807e635bd10beb5ce7644e31e63262736cc667a7b8c2 SHA512 921ddc7dacb6ad63abc90beb1d1d993e7b15c9cfe21e850a5852eb40735436e08b39fd2a6d83e23f641014ee81e718aca147ef1e21b55f94ce04a64ba7780455
+DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
 EBUILD pluginbase-0.5.ebuild 935 BLAKE2B 27bf1cfdd73c8264d07f7a4934ca521699192b8908335201a87eb56a12d3b9230f5eb4df407bb69621b24ee21fe02d6ecb72c63c7c9a4c631fb6801ca6d4b3e3 SHA512 1150ca5bcc39e7ff05ab78687417663ae1ba13fcba7f701479605da0162ba84508205e2c89bc50a9298c0c06c0adab1578cbee914532ae2d62555b1a0875699c
+EBUILD pluginbase-1.0.0.ebuild 931 BLAKE2B 6ee3880edfb0760347a590982827f5c1c3335c34256875424cd18a2a2f0da2b5ba409c447a65968c742fe394e32b1c7536cd114cc5c91d890f076d08bf73768f SHA512 f32fa8efdb45e93ba0391001eef6ce4e858e51018f74d9cbbcfb3702b5d7780f0f2b9b8ffef378dc72822ef0e40d879782d11a815a1a40759cb424e405c8f512
 MISC metadata.xml 385 BLAKE2B 0b58f71f7f6e816ba3b2c41212f371d37b0b09b38fc69a1adcdbab7a4537f9e9e7c5c0d9505e5dc72d219f30aeb5a3739c7f58bf4927f75323bd2b34e25733dd SHA512 166cec1bf4ad16e00b937dca860dedef5f8f766c1e3edae03dd29753ad9590843601723243e702344d1d4853b4d1a87c9c0960f9b70ac3dd4ad40995333516b2
diff --git a/dev-python/pluginbase/pluginbase-1.0.0.ebuild b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
new file mode 100644
index 000000000000..634f1829e08d
--- /dev/null
+++ b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support library for building plugins sytems in Python"
+HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -e "s/, 'sphinx.ext.intersphinx'//" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	cd tests && PYTHONPATH=.. py.test --tb=native || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 22b34485beeb..36edf6113d2b 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,5 +1,5 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
 DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
 EBUILD pocketlint-0.17.ebuild 478 BLAKE2B a2bc81998644c7cd671a21fcfa043a16ea9ea958678578ca257b161e56c731df40396b5a82936b77da0f6be8a2756bb76cfa1028981cbf37bf6453b3fadeef19 SHA512 e7f54bd33bdd4401fcc92f09d9c7af04669ac352c6a2a790f78cc73d6663a20ccb5f2e0d1505f96e81abafe0a5b11fd7e5c87d1eadfc150d3787b843d919f33d
-EBUILD pocketlint-0.20.ebuild 487 BLAKE2B 2a3c26ec0035f8f77f7d57d6e0fcbcd685a5bb89049eff03cf083ff8fb8d6ddb35d85c559c8ef221a64147b3b028f4d703c04cdaf56264706034c097b7761774 SHA512 9369f0fd7da203f60f58c08f558f9a0c6d03c5ef3aaa22fc980e79d54c2f89b7717ab69293d4b1160295487a2c671e4476f3288c81d4a9909148c0ac50369b49
+EBUILD pocketlint-0.20.ebuild 480 BLAKE2B a832e848eafcf61a36920601194b978ec33c14c15fd99cd1a2e6e2ebb19dba2f4cffd1d402f5eb1297422a0cf8b672a7fbe8581e9eeb4a000e7d0b298e18d4b7 SHA512 e8878b8497548a6f2a1d85dca5c7d789127e101d0cdbf278a5bb90ff424beee59adf123745f8c8d2a868d73a12f85de4a528e06b46d05ae91b99090682dcb794
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.20.ebuild b/dev-python/pocketlint/pocketlint-0.20.ebuild
index d3095c6f4606..293b6438d720 100644
--- a/dev-python/pocketlint/pocketlint-0.20.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.20.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 547846cde81e..110333c14baf 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
 EBUILD portend-2.6.ebuild 935 BLAKE2B 5ab99520aad767a0f6cc7c8b5993799db2652f0c03f62d2f90e31f023b37a657c5edb04ba704f14d6a7553d632a3e11a6ee6f2fef2f3b85d388d44fd3978e1e2 SHA512 5d7aeeb4b4255969f5d15c8e4c49b5770c451e8413d63801ecb446c80eb6f8cf79745e85260b97b6d0d9eed8d1d7717897c034fb439a16381a4dc449bc5bcd89
-MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
+MISC metadata.xml 469 BLAKE2B d4b527da8fd402a1f9099000265ed003555c4a6f492a5d9c0ee5c350af1a044fae6505b6f847d55f45eb4551c1dc6f1ac8b946c6ab5b68768bc583521fc4a485 SHA512 3ab794a7c4545b3d5a5281499ae87a0ed377bf7f83acd0ab8bb2eedddc3005f03d793837ef9aa8e681374357067a5edf7bcf50da48c0b5d36bf0696d8bd2353f
diff --git a/dev-python/portend/metadata.xml b/dev-python/portend/metadata.xml
index 530cb9c31df1..ea8f0ccb5cc1 100644
--- a/dev-python/portend/metadata.xml
+++ b/dev-python/portend/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">portend</remote-id>
 		<remote-id type="github">jaraco/portend</remote-id>
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index 119f3851dc34..707214004888 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST pyaml-15.8.2.tar.gz 16544 BLAKE2B 1e9820c172bb0c2e05c78f5dee3299c6bb0d83e2c658f3cd45322abac3404af1c9dd1f3b00e2c7b285cbd00c17d382c82cbb16b96bbac10021a0ca1a008d0287 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64
-EBUILD pretty-yaml-15.8.2.ebuild 768 BLAKE2B 273155c63790512216c8c855fc0799fa6b631c247fb911ef11be91ffc6dd4520d39f20bc7fa3c55078c594e4c6aecb38af9659727bc3cfe9022abde2f5d5ccb9 SHA512 5c7de198ad72fceb84b2366266fadd56038377e42fa6b98c3eca91ecdd11d4826c4606c63e80aa94e16255ca3010216a223c220767495aabd337e9f78dd8aaa3
+DIST pyaml-20.4.0.tar.gz 21176 BLAKE2B 0aac0250d610d7b2ef042e251142de4520e7db96073d46bde0dcb37ad43d9c278cbdfc7ab247b4d41c7c30e893306aa47b25a584a2aa4c157d66203b8e140895 SHA512 432fd215e034beafc07270a6aa8b726d5a16ef8946a95c1db9a34b4f492bbe2089dffbb1ce856d3e8153ec18ac943973a23e3aa9283d53ee0b2e7ba5dcd3d317
+EBUILD pretty-yaml-15.8.2.ebuild 767 BLAKE2B d7d607bdbeef29d67ecff12eeae5482d241f52160f985994a5b588d62aa35142b0f01b1d7c13280d0d917297ef826f7a4be7f4ca6209ce4bb8e74e1569678266 SHA512 0831b756090da15e9169d107005838709a82c2de712bf2b3f0321ad839aed059f0fc703cfdc2a0ebb6cdbd51fbb94f6d06f08317b66df88e3ce327293f0116f2
+EBUILD pretty-yaml-20.4.0.ebuild 718 BLAKE2B 53b9721e44ab77f07e61301a711489633deff6830204b04760a2c83982e56694146be3f4bac05c5749824759e2932f8c1d1cc49c5767c82c56a2b821d4c9ff91 SHA512 295d7cd6914dc97c4846299d8d801849030f70ed45cefed81699583ebbefd316b3ccffa61bbd61b4080f95bd4513c2d73b4e6c5e44b48c28ac7c9e0410bb1eba
 MISC metadata.xml 444 BLAKE2B 522c0c3698f3c35b698b255504afbcda02c321e542ba7013fb0e3de4f57334b31ee014dbfdc8914dd2760a621ab1724a9142029d506d8fa44831726ae7c2b6a9 SHA512 70aee75c33eaa54fc003d6879ada0d4fc772d00619273c7b0e7c5829dcffb8ba23171c563e6e922504d9256f53ee207b36b98240bec3d084a8e6de15e0013732
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
index b6ea020e3917..0a7759c45374 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
new file mode 100644
index 000000000000..9135bdefe03d
--- /dev/null
+++ b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+MY_P=pyaml-${PV}
+DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
+HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_P%-*}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/unidecode[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" pyaml/tests/dump.py -v ||
+		die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index bb7f838fd553..f05fcdfafc51 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,3 +1,3 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
-EBUILD prettytable-0.7.2-r1.ebuild 658 BLAKE2B 7cab6acc3d588f4e94304c97e371baef5fa7a36b52b32af2444a1e1d8c96bcf10fecb3d0c649e21bfa88efef6682319000a3b862de688599ff29cd91277c437d SHA512 804829e4a32d943befab68f4635147fdf72839b4d7ad074025c36d25093507c53fa87f0874adb1ba59ee0833d74181f98a27eb0b835792c041b9c6b0db6d671d
-MISC metadata.xml 388 BLAKE2B c19229c631dbaafafe2f8b2bcb0650052b4827bd6d0901d51d7c16fcf2456fca33efbcd21ee3ea1012a1b28c7cfc67042661b02bcc23af6d5768bf180304efd5 SHA512 7ac1cfd03216f171bf432f35b21bd6b43d297e77f41dffe5c5c5c4d85614c799252182a06bd5a116b5b831c06df115dcb933f1b2fd051eca8676f0aca7997d58
+EBUILD prettytable-0.7.2-r1.ebuild 603 BLAKE2B 9e39af9f3948dd40770a721d904a5e6b279db3966e147a6e4724237b4363fe0100710ffeb6ca2d6e5ad9b4ea2c7e51e2ea82d725d47aecc2f87194b069a67290 SHA512 173b0b05cf870890013dbc16bdd749f9b1f7e2db0c89c32689bc02ac87accdf48d18abc6430bd9703dbe2543a06834c4e3b8603229d19ed923d2a4fde2c428ca
+MISC metadata.xml 495 BLAKE2B 9c3e9523d22d7e5ad09e055282736a197e28df220f1c4cda5cec07e7f2ed05902e295ba20f8b1babb31a2fba802ef59b7e61f40b8b3b5487bc51edbc4730733f SHA512 3f8252016bd7e13eab68e5bbff995607aeeb5b02fdea7ed189026670548370d5d124145034e571ec6f03e30e8947923abf8e9d4546de0f28819ea78ec0cce341
diff --git a/dev-python/prettytable/metadata.xml b/dev-python/prettytable/metadata.xml
index 4a76f215cc7a..567af444478f 100644
--- a/dev-python/prettytable/metadata.xml
+++ b/dev-python/prettytable/metadata.xml
@@ -5,6 +5,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="google-code">prettytable</remote-id>
     <remote-id type="pypi">PrettyTable</remote-id>
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 0d0f5edb5fc7..007312c8738d 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,13 +13,10 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
 python_test() {
 	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 463f4284779e..17baf11b8789 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,3 +1,5 @@
 DIST prometheus_client-0.7.1.tar.gz 62880 BLAKE2B 8878a6e6a20f96443f1f14ffbb74eda7dc6f1f48151901da047ade6342ddd7858b4dcd808d80af64a3eff449c1c7425f9eb9f3d1283b65e8e6067c6b5fe2f9c4 SHA512 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4
-EBUILD prometheus_client-0.7.1-r1.ebuild 591 BLAKE2B 1d401370aecba4fbe25b110d9683db237969a9e522153bc3c4bf22b5302f1db274677cbaec1b6f3ab8d62b52e06e2de792342bec13f30e280f20dab2d64a9dda SHA512 1f81e4a27a8b523a914b170732bc953c397d4f9daab23ab895a699af3d9c3389613159a86bfb0234b78476d003771f8d046743912a9b657823a7e528c09f7f36
+DIST prometheus_client-0.8.0.tar.gz 67749 BLAKE2B 570c95de0d4e9e8bd625d55eb3dd450cf933ab7c8b6af74ff56414045f4d845c4a74f60d60e8b29f868801de12ebe2d39b5ac11701071c4998aec66719581b3f SHA512 a9d49bc4dac77168f94edf51344042bc5210b07ed01031dc50e323f86ea8292df7370956a4fbd9d9f85a0857a8ec9abaef30c0c2cd4dc5502df7264816eecc8f
+EBUILD prometheus_client-0.7.1-r1.ebuild 586 BLAKE2B a2a898d7983cc0018093183c90d6d250c9367a2c813b6519655174e19466de00286da1e515b663e935dea29d76ec0fe3db5cff5c4bfcc6efff27e5cfc608855b SHA512 e6401c2e0d5b988bab586e76af007ebc101dec0fcad76cd0a90b4d104beda97005ae0e17e71a7009e059677232cc68bd105ea607198ab9f1ba82ebeecc093a16
+EBUILD prometheus_client-0.8.0.ebuild 599 BLAKE2B f5a6f288ec77ead44ff5943e439ea33e7b680a4b255ed9c9637b8c00ca367bae521dd8ef292c3d33bf05bc39fe1f1352f36ac9f3d75a64a5051cf14e5173d8aa SHA512 9e431d87b41a9866a9be4a54b0def909cf71542ec9d197fae8340efe2cfde82e343361a17794ec984eaa254a9f3e2ad456be0f5e7d88db8624ec507db40fdd6e
 MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
diff --git a/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild b/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
index 1462bdee06bd..f97aa000cb03 100644
--- a/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
diff --git a/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
new file mode 100644
index 000000000000..173bdca64c55
--- /dev/null
+++ b/dev-python/prometheus_client/prometheus_client-0.8.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Prometheus monitoring system"
+HOMEPAGE="https://pypi.org/project/prometheus_client/
+	https://github.com/prometheus/client_python"
+SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/client_python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 0f362969ba50..ce0e8b151f37 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,6 +1,8 @@
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
 DIST prompt_toolkit-3.0.3.tar.gz 2997855 BLAKE2B e4fe0d6b43443fd541a5cd2a38c6bb503cd86a6d222e2d0ea692496ca9591ee7ea2147618a224ee4e86d69e74c8bf95c7c408d592e94895d5d6d985e721f26e6 SHA512 4fde083359445c6195c4f15d69e380a3454147e41aaa022cb237734896be191102de92509c011b39d6b31304b6443e8ba0092874fb90db911081f90e9e53b66a
+DIST prompt_toolkit-3.0.5.tar.gz 2999763 BLAKE2B 6c4c32583a363daf562d4fa29f697c3d38db1b84130f26167cae52ae90f5b34111a9785ed569d3bdb4c185271ef1a075144d1c53b46184c136e5f1af4713ecce SHA512 fe6cfc7223529b77bdfa34dbebc8f5690ac6a1d0082cbf3f03f49598408bcff082697df1bd7ee427c796fe0c8d73126a965269e77ed0e6f1519b338b464995a7
 EBUILD prompt_toolkit-2.0.10-r1.ebuild 599 BLAKE2B 1f0a4107ffb2aa869633c5ccb66cb72980e3b6e722ec893360483713fbcb657ef11187bac2aedfdbc8927acc541882d9a06529718df501236ddac3516caa4074 SHA512 361aa178206c3e57f38fe65e07f519a2e8577dd0069a50ff8f3cce634572510e3cc7ab15ccde8ef5b4ee8901ddab7deb5f7bf7414815bc764208e54703f47233
 EBUILD prompt_toolkit-2.0.10.ebuild 594 BLAKE2B f754b76d11c1ee8b0919afe8da1d5ac2c0945cf710ae3946fdaf0be40901a60b37d66731b662474db8344cc6c1a52dbfa733ae66937a27ea24c12194d5650a0c SHA512 13c1ea9b04779452608c589e5f0a9201d8b0c1524f0bd0274763e54b40e3b0a4ed4383a3054a2f0ff501521440b8460ad934e8b7726292ee24a065a7cb2901f4
-EBUILD prompt_toolkit-3.0.3.ebuild 595 BLAKE2B c30f5cbd5592319af4dfa452e8c7e54dea3996375710d0c63cabe9788728d2f641e815f89671ca8cd465a8c97cecc07b8cc446c6762fb1411347aec37eddd05c SHA512 f720ff243b56d393ae3e04c02375f4c5b9a25c2a0f0db3dea33938fcc1f30f83fcf467b33626a70f67ed3f85519d22f7030dd13a6d9a01d331b7ee554ae36109
+EBUILD prompt_toolkit-3.0.3.ebuild 594 BLAKE2B a66ab8284b0d700727220737c34176c50d54bebbdc03f0f1f6c0ae3d536b07a9006a1f5af308bee829c66ddb577c92a1fa3919570243696006b7f9e82273247d SHA512 1ab3fda1b4232ebd0dbdb0aa24962de97c467ad96477d8e5ae9d343bb772b8ec66f983748d97852d03f0abe2ed18e53cbea4c76a3460f3a7a68f002191793e1d
+EBUILD prompt_toolkit-3.0.5.ebuild 598 BLAKE2B c1f6330a4ed45ac7a7a0261177ef49d58a82b01caaad41809597458e9926c8d9a24babcf8ec5ccd1a80f0b945a5b4902a69a30d7db566674377dfafcd0286296 SHA512 3aa3fc5300ec41bcc04bf58db1db4c29f8ae43372c0f482aa549edc10c8e44f9993eef0ec567f060fa13a0a1de2a318755b988224fb46e832be3f1e958b87d60
 MISC metadata.xml 405 BLAKE2B df7ed8f078fe07004e09438bdc172fe1b24c4d8c06a82828a59aefc1466675de75bf7e96aa9a2012e912d3568ac87ccd4f7580cb4e56b6652d1228eccb6bec47 SHA512 31fd338e542e320ea3e089f13ce179af94777688d86f49ae68be12b6cb2463e6a5b5ff5270c5bd81d2b6fb76e834f0213a06e5daa3327d0b032a68de5f9da4d1
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild
index 7b528c8cdbaa..a280a736898f 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Building powerful interactive command lines in Python"
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.5.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.5.ebuild
new file mode 100644
index 000000000000..ecc349bd3526
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index ef49e69c8db7..cff75861d33a 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,3 @@
-AUX psutil-5.6.7-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a4a6150fa8679df01bba7fe99925f97bdaab61cac7ffa19341ea33c7a68260d644fea09a4774b795e813e12c4a4 SHA512 e33a7d375b72b3d43169adb493d8ad0684a2ce88159fdeb2e92ed966b2de1a6381a023f2e226b8d91194c66eeee4ce2b936cc08a9a84152a7119fecd8679723e
 AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
 EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
diff --git a/dev-python/psutil/files/psutil-5.6.7-tests.patch b/dev-python/psutil/files/psutil-5.6.7-tests.patch
deleted file mode 100644
index 3e6ec254c19d..000000000000
--- a/dev-python/psutil/files/psutil-5.6.7-tests.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -dupr a/psutil/_pslinux.py b/psutil/_pslinux.py
---- a/psutil/_pslinux.py	2019-11-21 17:23:01.000000000 +0100
-+++ b/psutil/_pslinux.py	2019-11-27 12:56:11.491875281 +0100
-@@ -1108,7 +1108,7 @@ def disk_io_counters(perdisk=False):
-                     fields = f.read().strip().split()
-                 name = os.path.basename(root)
-                 (reads, reads_merged, rbytes, rtime, writes, writes_merged,
--                    wbytes, wtime, _, busy_time, _) = map(int, fields)
-+                 wbytes, wtime, _, busy_time, _) = map(int, fields[:11])
-                 yield (name, reads, writes, rbytes, wbytes, rtime,
-                        wtime, reads_merged, writes_merged, busy_time)
- 
-diff -dupr a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
---- a/psutil/tests/test_contracts.py	2019-06-20 08:10:28.000000000 +0200
-+++ b/psutil/tests/test_contracts.py	2019-11-27 12:56:11.492875227 +0100
-@@ -174,6 +174,7 @@ class TestAvailability(unittest.TestCase
- 
- class TestDeprecations(unittest.TestCase):
- 
-+    @unittest.skip("broken with newer deps")
-     def test_memory_info_ex(self):
-         with warnings.catch_warnings(record=True) as ws:
-             psutil.Process().memory_info_ex()
-diff -dupr a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
---- a/psutil/tests/test_linux.py	2019-11-21 17:23:25.000000000 +0100
-+++ b/psutil/tests/test_linux.py	2019-11-27 13:18:19.715499797 +0100
-@@ -17,6 +17,7 @@ import re
- import shutil
- import socket
- import struct
-+import sys
- import tempfile
- import textwrap
- import time
-@@ -380,6 +381,8 @@ class TestSystemVirtualMemory(unittest.T
-                 ret = psutil.virtual_memory()
-             assert m.called
-             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
-+            if sys.version_info < (3,):
-+                return
-             w = ws[0]
-             self.assertIn(
-                 "inactive memory stats couldn't be determined", str(w.message))
-@@ -410,6 +413,8 @@ class TestSystemVirtualMemory(unittest.T
-                     ret = psutil.virtual_memory()
-                     self.assertEqual(
-                         ret.available, 2057400 * 1024 + 4818144 * 1024)
-+                    if sys.version_info < (3,):
-+                        return
-                     w = ws[0]
-                     self.assertIn(
-                         "inactive memory stats couldn't be determined",
-@@ -878,7 +883,7 @@ class TestLoadAvg(unittest.TestCase):
- # =====================================================================
- 
- 
--@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip('very fragile, broken with new ipaddress')
- class TestSystemNetIfAddrs(unittest.TestCase):
- 
-     def test_ips(self):
-@@ -1363,6 +1368,7 @@ class TestMisc(unittest.TestCase):
-             psutil.PROCFS_PATH = "/proc"
-             os.rmdir(tdir)
- 
-+    @unittest.skip('fails on Gentoo')
-     def test_issue_687(self):
-         # In case of thread ID:
-         # - pid_exists() is supposed to return False
-@@ -2090,6 +2096,7 @@ class TestProcessAgainstStatus(unittest.
-         value = self.read_status_file("nonvoluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
- 
-+    @unittest.skip('fails on Gentoo')
-     def test_cpu_affinity(self):
-         value = self.read_status_file("Cpus_allowed_list:")
-         if '-' in str(value):
-diff -dupr a/psutil/tests/test_process.py b/psutil/tests/test_process.py
---- a/psutil/tests/test_process.py	2019-11-22 12:37:20.000000000 +0100
-+++ b/psutil/tests/test_process.py	2019-11-27 13:07:36.966525513 +0100
-@@ -351,6 +351,7 @@ class TestProcess(unittest.TestCase):
-             self.assertGreaterEqual(io2[i], 0)
-             self.assertGreaterEqual(io2[i], 0)
- 
-+    @unittest.skip('fails if builder is ioniced already')
-     @unittest.skipIf(not HAS_IONICE, "not supported")
-     @unittest.skipIf(not LINUX, "linux only")
-     def test_ionice_linux(self):
-@@ -1486,6 +1487,7 @@ class TestProcess(unittest.TestCase):
-         d2 = clean_dict(os.environ.copy())
-         self.assertEqual(d1, d2)
- 
-+    @unittest.skip("broken by Gentoo sandbox magic")
-     @unittest.skipIf(not HAS_ENVIRON, "not supported")
-     @unittest.skipIf(not POSIX, "POSIX only")
-     def test_weird_environ(self):
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 08979f036d58..b4778095eb35 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,6 +2,8 @@ AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a5
 AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe52e255d3fbb0e9975cd0378574d7c6f6f097c4b0bae0f4eba74e939b15c19ccab1dbe84d28f434830d38db6b59e18246c3f2c2 SHA512 9e0ac41a70002bdac03628ac15b84edd3e67e589f8ca145242018aab03fc42b8befc1c0330f0111d01b239dc00b6ffc29965ba3c18ce0965cbe9e7b31d1fef4d
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 DIST psycopg2-2.8.4.tar.gz 377883 BLAKE2B 6d25a96d6fb45cc450b20fb570741538c2870e0ab205b9aab1018d4ef716bfba129235a422f2a0dfd182162bff948db8a2e4d23cd57dc01971f2e6f734ebf90e SHA512 d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28
+DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
 EBUILD psycopg-2.7.7.ebuild 1543 BLAKE2B 0c39cf7c409657c2954e72456892b53fd0b3714dca06c0527ae24a799955f2641d6bbb190df3457391044520f92955f57b086f6c879a7d57808f5616577a8b6f SHA512 b62576ef8bcbb5dbf863f16d3c4322d938b0ec0d3a43fef70b39177e7a11f9fe07e78229e41caa35976131e93c928c62dd196faf641cde5006e3db829260d5dd
-EBUILD psycopg-2.8.4.ebuild 1419 BLAKE2B 48a8af8d4c26ae9fbe3c2f3309d41996e194b92ad8f914d6fe25366eb7cbdadf60340100286e8e423e59bd51330948dcdf552734c003b4c74e7725aca8b26866 SHA512 1372cf52a655aaa7b7e7ac0366f7ed41baf4ebb77cab2c768425eb30149caeebcae0f66b71c05ae0c5c2fffd5ceed7c9aede29ca9907fb3842fbd4b572ded5cb
+EBUILD psycopg-2.8.4.ebuild 1825 BLAKE2B 16bb7de2454e41381ce67a522c2efb8e857fb45ec582c7c1f5693fbea4e5fc7c9fee011fe5ca540e14cc008fd9f0f32ecec3126eb2343861728e46d2081ff596 SHA512 939e698018e2444ee896e1454d0705b3295541ae983c11134e8702faf0b06935fce2286b19a05859c27f199576562dbe631f727f2ed0f4ac322742f1622419b6
+EBUILD psycopg-2.8.5.ebuild 1534 BLAKE2B e946a1df34822648f9db4ebe591d4323771d467c38c6914e49be46de198673eb87f14c183e8e6fc75c937e2f8e0a9c9ec650d2c6e626a01a45333a22af70f7ed SHA512 c6a1083e7e0c2b96675a4b66a1428e331330052f76f0ec85747188efc374cb7e3b57314d3d561506264fb183b6567c5d5d86aad8659f7502310c79f3d5d66227
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.4.ebuild b/dev-python/psycopg/psycopg-2.8.4.ebuild
index f5b41a2bfa7d..0552c717acc9 100644
--- a/dev-python/psycopg/psycopg-2.8.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -13,6 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="PostgreSQL database adapter for Python"
 HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
@@ -26,15 +27,11 @@ DEPEND="${RDEPEND}
 		>=dev-python/sphinx-1.6
 	)"
 
-RESTRICT="test"
-
 # Avoid using mxdatetime: https://bugs.gentoo.org/452028
 PATCHES=(
 	"${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
 python_compile() {
 	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
 
@@ -55,6 +52,26 @@ python_compile_all() {
 	use doc && emake -C doc/src -j1 html text
 }
 
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" psycopg2_test || die
+
+	local -x PSYCOPG2_TESTDB_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" -c "
+import tests
+tests.unittest.main(defaultTest='tests.test_suite')
+" --verbose || die "Tests fail with ${EPYTHON}"
+}
+
 python_install_all() {
 	if use doc; then
 		dodoc -r doc/src/_build/html
diff --git a/dev-python/psycopg/psycopg-2.8.5.ebuild b/dev-python/psycopg/psycopg-2.8.5.ebuild
new file mode 100644
index 000000000000..418f438ce30f
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.8.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+PATCHES=(
+	"${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
+)
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" psycopg2_test || die
+
+	local -x PSYCOPG2_TESTDB_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" -c "
+import tests
+tests.unittest.main(defaultTest='tests.test_suite')
+" --verbose || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pushbullet-py/Manifest b/dev-python/pushbullet-py/Manifest
index 1bac7118054c..37361424b883 100644
--- a/dev-python/pushbullet-py/Manifest
+++ b/dev-python/pushbullet-py/Manifest
@@ -1,4 +1,4 @@
 DIST pushbullet.py-0.11.0.tar.gz 21653 BLAKE2B a6c9b6f4958ce35b63ea4043d1d4f8691885bd0aa2927af541f2080a0b0b65a7df979a497967f3adceab8ad2382448a4c6a02d1184c9d72a18d91844eb970722 SHA512 b236f30b99e5bb79eff183529716c1c8f83cfd2526fdf50d86041eb6d3fcd6670d0c4dce407ae6e50aea0fa96d6a5527af980148f0c71ef758c480f972ad9659
-EBUILD pushbullet-py-0.11.0-r1.ebuild 1105 BLAKE2B ae3b7ce59c1410da02386eaa2f6aea342dea9cebd61aab57b66cde247d68a2d70ef694e2a27c914c5d418a273cb7cfe7d42cd5e3691eb23fdc599b99d63da15a SHA512 4f24b22cc00e423570bcd77db34433730119d5fb5018c1e21fa221cfc81adb05447c05a3e14286d81a870f29dfee978f3f18c5538233929d17949fabeedb0a0c
+EBUILD pushbullet-py-0.11.0-r1.ebuild 1141 BLAKE2B 8cd7760e7d8191d6851d6ba7d0e50c5a622ba11c3b41b4f3b70afef7d60d7c773dcb8f4ba7a95f89eb35ec47094b67fb5a6cf408a822d13adc3308e89a1b5394 SHA512 c4c4bec26bd661aa8be271b22d9f74560175e492e6bdfe5a259a2c17d4abe73ad41acdd8f56bfcc0b9aa0ce6e124f641228b5361f12cbbb0d8c3140ceefd7663
 EBUILD pushbullet-py-0.11.0.ebuild 1130 BLAKE2B 614cf6a5ea5661cfb8748fc1376775c27e8d4d776229e38f2c0f26379fa33e2c5d937d7e31a18b9018ab6a65c4745a6b4e09a60cec7a8f37685a47c981be24b3 SHA512 a017d3919983d68b71b092dbb88311f27cd12fdd590afd36ec17dc45a0af7ebbcaf6ae0d1509a53df42b62f744d71569db99bc94c44a9894e3a81a5f435380a4
 MISC metadata.xml 459 BLAKE2B 86e83479fde9503defd709e67ea6ba81e5dd9430e1e1b4ea6545f332979173fab9a2392528007638531c58ec205f2d45ca9817f21981b4ebd94f0f81596bde71 SHA512 cda083520abafb4b81b0691234a2bc2bbdf75f4bef69943e5243492a8d8916f9924eae5f06288a6f636ef7bf36477e198dc6a33a04e55a9fd2376a03999f91a2
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
index c1adf5146b15..d5dba92dc0b6 100644
--- a/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
+++ b/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 9a20c587e602..cac92d5e2054 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,5 @@
 DIST amqp-2.5.0.tar.gz 117022 BLAKE2B d05df3699a73ee3cc9540599b7947b4ad9fc1d74194cfbea81787d85c0f83262d109c153669d746ccfb67a1ecb21755da4615043ebfa67c84c8f108ef61ecd3c SHA512 c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b
 DIST amqp-2.5.2.tar.gz 117788 BLAKE2B 6a6990aca0a43a0c546198b999d0d3680d6c44908e144f81bd8266abac4d2d9b7ea4c65bbf969310f1236970ebe0ef5ed44cc558109ba1f680348e3ba2789e83 SHA512 c540ce39c06bb947e55b4afc56567d5fc5a82b65a2f7e2cc1f769f96da74f788d14e1e9c02852a259a4980c36a4524f07166686c0357f96219fd9f8612a6159a
 EBUILD py-amqp-2.5.0.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
-EBUILD py-amqp-2.5.2.ebuild 1475 BLAKE2B 8e22d26dfd22ad779bb55a902d8e4d03d6508572b4ad24c4b20ec9a097909af16302dc0a0997ac2c31b689e55ee273763fe8fdfe72aeb2c09192bd89c0d44c52 SHA512 0450402e50929386267c6f51400d4eef88eda12a4d276cd249408f94e1ceb7b82142b0f1374c3d16d9aa09429f02e63e77c866666ebac97325819a5d9a299678
+EBUILD py-amqp-2.5.2.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.5.2.ebuild b/dev-python/py-amqp/py-amqp-2.5.2.ebuild
index 02877aad3002..22fd77713035 100644
--- a/dev-python/py-amqp/py-amqp-2.5.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.5.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc extras test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index cb1539dbe35d..9a0635f60c36 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,3 +1,5 @@
 DIST pyTenable-0.3.20.tar.gz 117381 BLAKE2B 7d2259ffdd16a2eb5a536e13a09920f67316f336712f07ea2b797016caaa14ab05686b75349aa99e0b794e922b87cfbb58806511c05a65a43d6e5adb27133ad4 SHA512 5e610fe3c450de6614d3e3483bf1c8e866f497b1d4bdeefed2854f23ded4707981750a0a3f3571f8bda6cf93b129e62f0bad6d55cd0dc58339dfa2429f57d9ea
+DIST pyTenable-1.1.3.tar.gz 139494 BLAKE2B 292b5f8a4da5a88e0b0f6be8d3dc72601e7218361fabf31afcfd229c1448f82b85b4911f93e34523ea03b69f2d932f03febf0084861d72e37e5c2f2b6ec49f67 SHA512 1998c1d58edcdc75983deef083b9c6d382f144aadc87a5e4be287712a8e07751fcb43ac697c5c7df56b671aa23c769db45d362247eea9456e24b7fa0a1241b9d
 EBUILD pyTenable-0.3.20.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
+EBUILD pyTenable-1.1.3.ebuild 718 BLAKE2B ff9e8b35ed30d21f50676a2b5b89efa5a596b4500d104df29ce2611516a804f3cb2547c320442728596d3d09b60e04b7e886c4bbde2c3acc3e0fcbb6917bfb22 SHA512 eb9938f84132962593db2df9179d3eedd7a8fcb033f22aabc56df199eebd668ba21700b980d92a68e6955b22d28a590e487085052025d9aa8a1619871ca5753c
 MISC metadata.xml 380 BLAKE2B 051d5d76aa2da7bc57d1382fc596b4f061f1c028414038a73ffa977279dd9592c581fb8877e49e8848bc8d44d473f32bd548007b91b259e407e642c5a965e1a4 SHA512 513a84951b784b1c14391c1a283a5d9796d9cb56e178c9ad58f9dbaff3e285c48d45dab6b9fe0fa531cc358a4454e35348c8472e986a43259bef784eb565d065
diff --git a/dev-python/pyTenable/pyTenable-1.1.3.ebuild b/dev-python/pyTenable/pyTenable-1.1.3.ebuild
new file mode 100644
index 000000000000..3aeb61370d48
--- /dev/null
+++ b/dev-python/pyTenable/pyTenable-1.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
+HOMEPAGE="https://github.com/tenable/pyTenable"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests_pkcs12[${PYTHON_USEDEP}]
+	dev-python/semver[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/docker-py[${PYTHON_USEDEP}]
+"
+
+# requires networking and API endpoint
+RESTRICT="test"
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 9fd8fa5458af..065c9a5674c5 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,4 +1,4 @@
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
 EBUILD pyaes-1.6.1-r1.ebuild 634 BLAKE2B 8acd0c9f3006ef236c9a6fd919613977d3df457bd578f42c2661e5054bb6218892c64af8d505803a7ac336fae223d0ed0dd5ad298123fac2dbea5b51ce4093c9 SHA512 87ab6faefb09b458a3b7ee21452e2f99132dff66f56ee0d3347df35bafb7c8ab410559fb739c1adebc62ca654f202cbf1525dfe3b594885aed5b862766e4d836
-EBUILD pyaes-1.6.1-r2.ebuild 747 BLAKE2B 60622698c40bf29e1ed529b8f76a34e6f2ec7c9e33ca2145fed95f461711b7e6f630251f88fd5497ce2a7d2abb8d6ea388d4588d206926aade32d7b638592a26 SHA512 bbb5283b3e6329c006518502bf817601be96b67eec51d9feb9733443d32ab3ffaddcd9972a2ebf61547e6cea60e59e80ec6e609f3af93212b1d593351d0ccdba
+EBUILD pyaes-1.6.1-r2.ebuild 754 BLAKE2B dcf54c8a4858fccf507e13e92890058f16969f9cf06bc95308ded9d44f23348c17823cf8035ed8687912492ae5f2cb61b9915de954af8d5823701692750820b0 SHA512 2edf0733723c2f88ae01989f17b57de1c2cd46bf0b2e03509fe2cf3c79b86b867b5cf4743d3bb1844713af97b9206d53574838061bfce0ea252250793d06dde1
 MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index d69eebe72764..0e64197b7170 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.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 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyalsaaudio/Manifest b/dev-python/pyalsaaudio/Manifest
deleted file mode 100644
index 2df50e66e40c..000000000000
--- a/dev-python/pyalsaaudio/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyalsaaudio-0.7.tar.gz 124577 BLAKE2B d6a5d29f3d8eee7d016441ecb7dd418a8061484a72dfc8ea4cbdcc102fc70aa12f09ff7136380a50ca5149772d3c0d8d6c2d950a5d26877664371e30fbe90857 SHA512 aea46ebc4a59c791e318e58fa7c307b73ea7e1eafdd6b2055df312e26e8d4868ca582b76dd2f203cb7c632a25e1bfd066f6f9522484aa5db51f404e5f99a38cc
-DIST pyalsaaudio-0.8.2.tar.gz 212747 BLAKE2B 59eeb2fce58d035cb59e36c717cbe6ec367906728c04dc4c4a63d05aaa6eca41fc530b587ad5d3d33161b9f0794ee4e8af0b7efbc1203584564e00efc080dfc6 SHA512 cba4acaf18b74f990547a590da5bbb824398518444cd09cf80d2e4dcb1176fd5469b107c96b3696ca98ef8ef4d1026feb22b01f730b2558c9dd60ee58500d4b5
-EBUILD pyalsaaudio-0.7-r2.ebuild 937 BLAKE2B 32f13d6d6cd0fb1b775395daefaddfc2082de592a4a11319c1ac44b6744ef7c053dff548e66fe36759c078263994c641c9632ac7fb876106f8f2374101747dc7 SHA512 3e54278b0e396f5b6e7aaf3b0482c8e26626c2425c6c1196b33a8afa1f5d390f7b11be8caed540f9d8442863338500dbe76f829bf6964bb708ff7cb7d29ce035
-EBUILD pyalsaaudio-0.8.2.ebuild 1137 BLAKE2B 8c33112a4c42f0183f60331081ed64211e4c7e1aef887aedc3053be60c47d269e97aea740ab50c9c7fd0e252052f9952c6ba864bdd4130dc8de6e019eda801f2 SHA512 05b20bc27913a26733b41de957d5e4a0436aae0b6c5e6db417a8eddbb76518e6a2e9c5b9389ffe3d4e45c213cfeaf3ed93e0c78d4f5d815ad50513de47b299f1
-MISC metadata.xml 370 BLAKE2B 40c4cbfd6dab8c228180d1c80b37ba7989ffc9ba5db1cfba21f0ffe47b013b88ab6206939340e1d0b776f6f54fcbcba410f25b41d07f8c890ffcd4c97dbdf113 SHA512 8f63acae6a202a3d23c7b7c1777db4734de9e630630d679417ff2f9ea1c3595d855c6bb3d21f5ea6e889bc005fb500cdc95c2b7247725ebb14d0dc66dc8e4ff8
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
deleted file mode 100644
index cc8e0a892d3b..000000000000
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for the ALSA API"
-HOMEPAGE="https://www.sourceforge.net/projects/pyalsaaudio
-	https://pypi.org/project/pyalsaaudio/"
-SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86"
-IUSE="doc"
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # Direct access to ALSA, shouln't be used
-
-DOCS=( CHANGES README )
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	if use examples; then
-		docinto examples
-		dodoc *test.py
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
deleted file mode 100644
index 755668b93831..000000000000
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="A Python wrapper for the ALSA API"
-HOMEPAGE="https://www.sourceforge.net/projects/pyalsaaudio
-	https://pypi.org/project/pyalsaaudio/"
-SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE="doc"
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # Direct access to ALSA, shouln't be used
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" test.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	if use examples; then
-		docinto examples
-		dodoc *test.py
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index 490501d89856..69f79577b9bc 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,3 +1,4 @@
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
+EBUILD pyaudio-0.2.11-r1.ebuild 1093 BLAKE2B ca1c3c159c394ecfe93e5745087e29945dec0eb50c7ec1b4abd1b985c3695a3a5a3afcf267ccd7cdcf03af1e2d95b10150ffcb5ae9db823f3cd13e94f62d0a85 SHA512 5d88f5670e4a07c53a54a2cd0d055834c4aa12342bcf82404cb1fda2911770e6caeb30e4b1177436eabbdd96ea0d69b7c0e6bca5d02eb95a7627c14cbb804199
 EBUILD pyaudio-0.2.11.ebuild 714 BLAKE2B e85bec919b9580f89a925ca7d6d8a75a64880cd2e02f51e40a4e4245e636d325bcb5db482e8cccee94138f8e3ac9f5d05b67fe614237c170ed8d91f1268bf7e3 SHA512 2e8fb5536930ce0bdf888b54c3e12f0758aca3aaec1969a5c47868ae360a91afb61de16e228dcaf70994ea7fc71cbe10cc3380e1a7d00ed2c662669535bc1ff7
-MISC metadata.xml 397 BLAKE2B f247d3d846ecd698c84729b9e20b5acddd6c00897f5ef0cc4620a948ad6280496c2102293641f905511857748cd515839d050639e5eece66767e75935ef75014 SHA512 30e53ac1083c59d997dd136608cc3dc119dabda0f9d580fb4edf4cbcf8089ceaf92e72d59154a9105ea07f7d5b4ec462c9edc137f21809c820b41a8498b59802
+MISC metadata.xml 598 BLAKE2B 21f9980ccef4c432d1191c9917405468d75b0e9a18895e70dd7c9abd8db14fae0142ef359e63816d6ff7bfad9a054118142d1b5e0a540a4a0c04e795ba290a93 SHA512 d6d33616d6f1dc38e6504807d9b4040d052e4c96099276dd8b6b5c456dca4a7dcf24f25f13813625a4ae139ab2fee68156cff696ec5658753bb282a260f17955
diff --git a/dev-python/pyaudio/metadata.xml b/dev-python/pyaudio/metadata.xml
index 4f27b7264e3d..e1eb80143bbf 100644
--- a/dev-python/pyaudio/metadata.xml
+++ b/dev-python/pyaudio/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>gentoo.2019@r123.de</email>
+		<name>Robert Siebeck</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		PyAudio provides Python bindings for PortAudio (media-libs/portaudio),
 		the cross-platform audio I/O library.
diff --git a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
new file mode 100644
index 000000000000..ec8e831d71f5
--- /dev/null
+++ b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PN="PyAudio"
+
+DESCRIPTION="Python bindings for PortAudio"
+HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
+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 ~x86"
+
+# Tests work if you have the correct HW device(s) to test. 0.2.11-r1.
+RESTRICT="test"
+
+RDEPEND="media-libs/portaudio"
+DEPEND="${RDEPEND}
+	test? ( dev-python/numpy )"
+
+distutils_enable_sphinx sphinx
+distutils_enable_tests unittest
+
+python_test() {
+	elog "These tests require an OS loopback sound device that forwards audio"
+	elog "output, generated by PyAudio for playback, and forwards it to an input"
+	elog "device, which PyAudio can record and verify against a test signal."
+
+	cd tests || die
+	# pyaudio_tests have very complicated runtime requirements, therefore skipping them.
+	"${EPYTHON}" -m unittest error_tests -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index b6c83776bd45..9f54a6a6301d 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,5 @@
 DIST pybind11-2.4.3.tar.gz 138789 BLAKE2B 6279ddbc4ca4c8a62eeff684cac789a315eef0ce769258c8152f7073f8bbea39e582ed1ea86fae6878f46c675ed998c314bbaa54a40457287833cc555f5d9692 SHA512 97b6ffb38dbda8021e8265c2052df65785d532dbcd94a2b711306f806eab1a9e2aaf31ea466f13eb5784856ac69e0f4c1dc6d742aa70e5a10ce9ce338e5e9d84
+DIST pybind11-2.5.0.tar.gz 573769 BLAKE2B e46d99f873f8266efc577d3e0ab1e8a78784a45c35995bc3486501d627698e0fb10205008e8cb82c84e971f20cd02a6d2f08390f3a3041fff1a21c45f11b197f SHA512 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2
 EBUILD pybind11-2.4.3.ebuild 478 BLAKE2B 67d1ceb0003ce620d43f0a33800d5b9718a1a48d00eec456e88b63134df36dca5ab246e08efeb8ee1991f30dd3a6ff0c12a4f35fd156cf92326954448ad83c22 SHA512 4f8965e2cd685936d76ec5e131af307a919e72ba1e8d845993b3c5c6d1f203927bc2127a389658715d88fb208f5b3f5ddc7b574272cbf0e3130e3a80e1930e7e
-MISC metadata.xml 344 BLAKE2B 43767c7307da199018d865ab629b72a9df002046ae4fb011fc52610d56a0f890af4da32a56ef0ec73f9f20bb6849734cf7bf25b4f961b6e7fa6e61695ac96a58 SHA512 185ed0ca79b66e1ae69b3989366a304efd4cb71845e62bad7cb64b21d3c5761e2fb09b9eb4aa9647a975e2759de1104910ebbf48b6069bb9aee24b129ec3fb3b
+EBUILD pybind11-2.5.0.ebuild 1305 BLAKE2B 65b14a85077c4c3254f497380a59ee8fa3ecc2e995f214d3aa57754e68d7f67ddfcf94f2be5df6638504bd81d71257acb719346dede21c63c0da846ec4f00a33 SHA512 a1514c9d8f8b3d041cae951ef8acf8e1c3c9c35ffedf071ca8a04d63a64a7fde2e94ee5215e18f618b6539cbbf225309a4623e75bd255eb8c04cfc1b7dbd9fb2
+MISC metadata.xml 348 BLAKE2B 06ae224547d14422e51d6e07615adf51fee22afcde2391a4483a8e1937b932a4268f0b31b94d4df12bb06804101b0e6b51614f0ffcb601a4fa34616dcc939377 SHA512 02a7f6afd867bf9f7832a9c8b2d1470be6b1fd537ae8f9509143bb6acb3af75c1eefa38b330bad6aa5e2c37a1158b4b0260277c6307a9b97d144d6c3695a855b
diff --git a/dev-python/pybind11/metadata.xml b/dev-python/pybind11/metadata.xml
index cd8fa63c07d6..025838642020 100644
--- a/dev-python/pybind11/metadata.xml
+++ b/dev-python/pybind11/metadata.xml
@@ -5,7 +5,8 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-	<longdescription lang="en">
-		Seamless operability between C++11 and Python
-	</longdescription>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pybind11/pybind11-2.5.0.ebuild b/dev-python/pybind11/pybind11-2.5.0.ebuild
new file mode 100644
index 000000000000..338584b79ec7
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.5.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_sphinx docs \
+	'<dev-python/sphinx-3' \
+	dev-python/breathe \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+DOCS=( README.md CONTRIBUTING.md ISSUE_TEMPLATE.md )
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+
+	# broken with scipy-1.4.1
+	sed -i -e 's:test_sparse:_&:' tests/test_eigen.py || die
+
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 83f88860bda8..e2ba5db8f984 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,6 @@
+AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb904806d4016088d0c6882958ce7edeba2517f3ab4b8139a8f923e3baec435bc9a21cf3546b60f4459c5cc9ad7a54d6 SHA512 607d6f2cf6bcaec394b755f452d3c4bc0f6edb39bea185a18258c1ee0db11a99d84c7605dbe9db83906518d41baf065b2b8d9261db3736f8a737a2a8f7dff266
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
 DIST pycairo-1.19.1.tar.gz 205196 BLAKE2B 504334628daf75dd9145c97fbd86ea133b4be225ce7fa911b48231ebd5434678ffa7b1f185e0527f96b4b36955e788d0bb4fa4d308843e5ae9b20a41d2126301 SHA512 a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f
-EBUILD pycairo-1.18.2.ebuild 1414 BLAKE2B e7937011d1cd2853a5aea1eb60dc1d4723976847970f56696c948b3a1ad0d8739028922ea8f7a7ec7b843c89745179877d481bfe32c8ea14c6a69af3246a2dbf SHA512 20832beb5081377bb6618d13065852df1bedb032f6a4db33084224bb341e0368393bd4dc5e22cb2093f17a8dcbb2e7cdc17ac9a9a79ee1cfdd85fc6165345236
-EBUILD pycairo-1.19.1.ebuild 1411 BLAKE2B b1395befcf35cad2a87984cec394b94841d4b7993cc77870af548974277b86682eb9f83ed405ca609ca874556e4ae72e51dcb2c742ea49e9220c790021b9dc17 SHA512 5ac52c24c84538d5033efc1b3dfb0b33ec79106c5f6dad791f77131cac9cf5285f357520e48e4ffc69fc2e6a9e8121fc3d5c2213fa3bc21dcfc1a385b91da89f
+EBUILD pycairo-1.18.2.ebuild 1170 BLAKE2B 417a4ef2d7d9d89b9c39931007a9b41eebe49f1184f967c536d2816847c521523659ceaf02865b0093b02c09109586213e9fd8ef21fc234f291c6fff51ca895b SHA512 e9aa24118efe4d0d8b456e7c8a7bff9cf7408a23bff1559f2c44f463ad97ceecfed5c39af90397ebbaed5de430f8fab3cec02d9d06319960349068cc38001840
+EBUILD pycairo-1.19.1.ebuild 1167 BLAKE2B ec7f7443d44d189c15c8bac9cb19c3e74fcd6ac765833734078a1050ebb14774179b60a5dd92b326ea74fff6626c062fb7afe076dd0b0fb36112ab6e34fc149e SHA512 41f22e0c13532bf8ee42c62efedc29ef3a6dbe1f71c3149a32fdb37012a385e72a9632a4fac6e2d16935ad3bc9fdec346148c8776360c4d460cd654983a5efc6
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/files/pycairo-1.19.1-py39.patch b/dev-python/pycairo/files/pycairo-1.19.1-py39.patch
new file mode 100644
index 000000000000..97b20227ce8b
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.19.1-py39.patch
@@ -0,0 +1,26 @@
+From 3ecf0a4060d6de3b92a77a393ece663455cf6add Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sun, 10 May 2020 11:22:40 +0200
+Subject: [PATCH] tests: Fix syntax issue with Python 3.9
+
+https://bugs.python.org/issue40246
+
+I haven't actually tested with 3.9 yet, so this is just what I found
+with grep.
+---
+ tests/test_enums.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_enums.py b/tests/test_enums.py
+index 4bc2e3d..02756d0 100644
+--- a/tests/test_enums.py
++++ b/tests/test_enums.py
+@@ -79,7 +79,7 @@ def get_prefix(t):
+         # special case..
+         if name == "PathDataType":
+             name = "Path"
+-        return"_".join([s.upper() for s in re.findall('[A-Z][^A-Z]*', name)])
++        return "_".join([s.upper() for s in re.findall('[A-Z][^A-Z]*', name)])
+ 
+     for t in types_:
+         for name in dir(t):
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index 7621e8dfbeff..b8e47a44e65b 100644
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,10 +15,9 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
+IUSE="examples"
 
 BDEPEND="
-	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -29,22 +28,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-1.19.1-py39.patch" )
 
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs -b html _build/html || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests setup.py
 
 python_install() {
 	distutils-r1_python_install \
@@ -52,8 +40,6 @@ python_install() {
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/. )
-
 	if use examples; then
 		dodoc -r examples
 	fi
diff --git a/dev-python/pycairo/pycairo-1.19.1.ebuild b/dev-python/pycairo/pycairo-1.19.1.ebuild
index 66921d842bbe..b05ecffc14d0 100644
--- a/dev-python/pycairo/pycairo-1.19.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.19.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,10 +15,9 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
+IUSE="examples"
 
 BDEPEND="
-	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -29,29 +28,18 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${P}-py39.patch" )
 
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 distutils_enable_tests setup.py
 
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs -b html _build/html || die
-	fi
-}
-
 python_install() {
 	distutils-r1_python_install \
 		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/. )
-
 	if use examples; then
 		dodoc -r examples
 	fi
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 4e0d62c1cb3c..886bced18d7c 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,3 +1,3 @@
 DIST pycares-3.1.1.tar.gz 216259 BLAKE2B 4481689e418695838c456f1e15b38dcdabadb106f393f52ec21a358b06621650d4e82086ca913abb341b9d8658db1c9ddd0064e68413e71a4ddded070647edfb SHA512 52c529510e3342c0b97ad0b4b9277d1f364da7719817a31a3cfac1f88613ea82f127182eab7c52c2fcd08008c689885bb4196f887a0f81b769f08f7cbf39909e
-EBUILD pycares-3.1.1.ebuild 660 BLAKE2B fc409b4a538c74ef5bd40d28dd322f7731a95c716607d996ab5e611dd2482bb03531ef427e1a1aa3946417ee995a282c72254f66e9eea321b7999f8813bd7896 SHA512 df7adeb367656003a6a28792e92ea95886be4d3495c654546bdeb24db4530fa74702f15a78b39874b37e5d256f919786f8133c5234295ac9f82c154600b76de8
+EBUILD pycares-3.1.1.ebuild 667 BLAKE2B 78994dea8d648e35d75b259f373ec0546a5ac7dcf9cce683eaac173455900ec7f9ba5f819481ab25835cf2f35468e809134d12490923f3a9ffc9d830c244ea14 SHA512 d5d868966d477db694aa9c21bddac7352e253ed912c54246bfeb70e713eee43becda041232c66f8c4874ba900a5a43eb18e3a05b7a42ff2ac74e9f11ddacc724
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-3.1.1.ebuild b/dev-python/pycares/pycares-3.1.1.ebuild
index d813fe5ac6d7..ea6355aa885a 100644
--- a/dev-python/pycares/pycares-3.1.1.ebuild
+++ b/dev-python/pycares/pycares-3.1.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P/_p/-fix}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 # Tests fail with network-sandbox, since they try to resolve google.com
 RESTRICT="test"
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 4655d57370cb..4eff07a42f6e 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,5 @@
 DIST pyclipper-1.1.0.tar.gz 53916 BLAKE2B 53b7b6609d602cdcbd8c8f4ceaed999c97e155747f7daeb630333f18fd2719040d118c8fa3d0e60a1ccd92c20aecb355ec9d4f9c22f66dc07b14a919f981f667 SHA512 53371bc2e0439f72ac4ebf96f833c4451d2b1924d7f9cddcbac79a0a6d6bd95ac1fb3fb08e3ea3fcf3ffe22cd718d31c7c528016605b275a3e80642e58546d74
 DIST pyclipper-1.1.0_p3.tar.gz 53353 BLAKE2B 1e510ab97ef98b83c763d4bc1154eb32f94bb035823ddcffef09fe32861c2384ccd6ffd29e5a31c0cabf71c801dd90d0176a68e93c6c2e2c9bff03c2be3fff33 SHA512 0b3c3f18593bafedaedf8a91411ba5d3d1c2ac55c949bca21e3a527ca0930eae5ea033a0f57337573a1106e2871a50dcb0176b959b98ad8ac58636c6d45f94a9
 EBUILD pyclipper-1.1.0.ebuild 697 BLAKE2B eb94f08accf6b67bd82bcde3b794e49daaec73c905937bea4f31ec03446b8b4d3f72298ab1e891d79fbc260588ec47eb3e629774cb875868c22dd88688cf1355 SHA512 fd81e4272d19c9b9b67a3cd74a216ef84e9af8150b176235bfa320cca385fc9603e143b9f079591943cfd222e679d1207a11012cb6397732c8e9577ecf3dec4c
-EBUILD pyclipper-1.1.0_p3-r1.ebuild 769 BLAKE2B c1472af6499a259f05c769a8378fc733ed047831ba9af390827a04e7a4ddb47385db295e4219bfcf58104ba2c82d7da4405b37b5fc355db1ce2eb5e8e0c7e0eb SHA512 dbebd48c3fff1d023f08887551507030b29772c8222db78320e044b7b109a7ac26ca9ce3d844fa882af430a4a8c4867b27941cfa67b099c4f511e8e6dff7e6e8
+EBUILD pyclipper-1.1.0_p3-r1.ebuild 787 BLAKE2B 467902dc039d84eda5ea972da3476ee3e7d87cee5a870cdf7b1911241ab20694ccb3d15cc83740e0baa1b88543028d0477a523ef8e03148e7e3a17f235ad90ee SHA512 e887c57691cb41f3866d7401667b6ef5a5a158d14f38ae58863d9938224e1f1bc158c1dbcc981e739380238d07e9f443fe9cb264f1ac7681ad7c2037a12e7b5a
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild b/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
index 0b3f303ecd9c..9ba221fb3ab1 100644
--- a/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index ceaf4e4b3383..2fb0a0cbaafa 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,5 @@
 DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
 EBUILD pycodestyle-2.5.0-r1.ebuild 1130 BLAKE2B 130e4b41354b1a24331e91b9406a47752a3c8466973bc90cec38973fee2e235f41d7f9abc86907b723898a72b5676709f1bb204bc6da845f0ce78fb508f21560 SHA512 df471dddd80d5b9a4f63f0e5a0c29167be7956f51448b73d0f88946c690315c0757d09b5ef6c684a366444723a94be9dbd9d66eced6e1ad079a492a5d8a71be4
-EBUILD pycodestyle-2.6.0.ebuild 915 BLAKE2B b908605cdba0a13ccd0364f86d96f8cdf634afe2cfcc9a448d7d785be12d8edac2a9251d5ce9da8eb27ba46bfe95fc84cc27e2b2a75f0622b0454547c9252fe1 SHA512 c8dd899a75bbe7ac96dfe15236156f1e950cc89c1d6d9db206ebfba1043d6f1bea4b99dcb22c4a1d10513a9091f89ca14a428df18a256753826bdbc4bed81246
+EBUILD pycodestyle-2.6.0.ebuild 917 BLAKE2B 1ac03da246e02b994e95d30c7dbe5587f946a30cb58df71ead85edd15418e0d7db5e1fa81b553419698216d73522fa32b54166b21a301d2971c6372d537d248c SHA512 140bee85417c6a1fa0a5eaf524cfffdf717792e45b79364da3b4f39d1ad481e3ff93ef6937d4d43f0aafe9c69c013aad0728989db8c680425d7d02b25ba96b98
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
index 04692ec49c1d..686651f93a4a 100644
--- a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index bbf6ce8f8010..0dd1e0e30aed 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -3,5 +3,5 @@ AUX pycurl-7.43.0.5-telnet-test.patch 1561 BLAKE2B 640203da8a9b6a13cb5fce187c669
 DIST pycurl-7.43.0.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f2722cde14c059884ee552a2340fe6b646b4021326f72730aa9eed82f57b5ba923d19c2b8dfadb7a8f8819982116e7a SHA512 eec5c5f10b9a78bcf7e786368cdd5dc165faa4bb646df39ad52c1dfe8110e3e56456f5961f63ab7b460e51e56c41e66a0fc4652c8132411f1dee4074b3cffc00
 DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845
 EBUILD pycurl-7.43.0.3.ebuild 2671 BLAKE2B fd73be6647ac15afe8e6770c6cdd47d835b2efce1abc02895aebe2a29c70d6791589557056f493d79510d2c531e745521fef7ab69f552008110646232eb7ccaf SHA512 7b51cee2882727f5a4dd9e15f1e14f598d9c00be43b5b2d567cf9d556137ffcbbc1a8ee5efa6d4311983a906fb41e2c043a5f01dcb50c050c2ea3a6c56988bc3
-EBUILD pycurl-7.43.0.5.ebuild 3018 BLAKE2B 59b7624ed97e13001e46f12d4926956d98a7e4bd7434c2f32c938f8365b36f3247f52571602d805f97261c2b4013d19ac16ced61751bebdde765dba64a47a4a3 SHA512 a5b22938341c046323121827aed289c88a0ee8f7589b5443f2a4ea2a2e9d078342ff5f557a293b7f681e026ba0203f76293f678a04868969a2b1ae09a77bdd29
+EBUILD pycurl-7.43.0.5.ebuild 3017 BLAKE2B 36400d03b1621720dfe4d5d3d7234b6c15272ffa8fcc8473014b3026d69407672963398ce1a7043af09c7caa6c44e08adea62ba04b42057a36ca90c4b09d82d7 SHA512 2534b4900f0b18ab352a49b7c11735c0973d9e91d93f98d3c03471ca00384d00e4c52b7fd493fc758dc5d9f7652525bf2a034a79845583b0051f0151013160b9
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index d9690b7a7e5c..046812098a77 100644
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -17,7 +17,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 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index deda8eceb07a..34f773359d3e 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,4 @@
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.3.ebuild 975 BLAKE2B 411c92c11a8d21fbe9f2cbd96ab8759477a326778b699098a1d9f5a70ff4538f173fe637cb7b5d340746c454e97be84b6f0e9ba84bec0bd599427e27651192aa SHA512 ebb88c5dff81676376d18db15778d6aaa9170aa67c70a875401abfe35792debb3c16957cc7f9dafa3cf1849bb3223782a1d77410208ef0ab8152ab1f32d11cda
+EBUILD pydecomp-0.3.ebuild 974 BLAKE2B b8389f72c99cca487ef1739fccc8cb9581003f5d29be0457c35a40902d29c1922df0cf338c2c528f00cfb404ea267c7a52d3f64d22b74a5c1c9d78f37af295d0 SHA512 3660a157d733cc28edd613880fe8e0a81dcdb0e4353109dd9352abf347adfc87af934ff96ef0e0b67ef0b554a7ab23929b90a4d4c1e9272e9c796f8aaa34fd06
 EBUILD pydecomp-9999.ebuild 1247 BLAKE2B 09bfde84e9f7b9470217a6f7383ba4889e800c6faac36565479050d11302b09e10505287563929d27d411ceaa3afe8429bc974be0f1f72510e631b6391b75672 SHA512 87466b8cd25c870ecfb66d4a9dfe81ed644e26a7d6d4c10e263138007d46c232ac808c4db9e30bf65f232d708ac669efaa493f9da6d400562756d1c9c577f005
 MISC metadata.xml 690 BLAKE2B 4fea9b06a19ceb9616513e452d1016972ade5c78bdfddb2b94c5d6c4b9884d8c2a379a9874ac5a4dcb7d1e9373a030fdfd1fea8c91a6e21ecd723d04e85a247d SHA512 ec9167bab90e021522941252d9f523ce6040adcaa337b4bdd31495867ac64cdb8ff919fd0928e9ad8e2c12cac45555b805cc7d9afab059e1a20b014fd8c25707
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index 315e9a864d62..4cf31eba19a3 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
index a52a51856181..3bed4ae73434 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,3 +1,3 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2-r1.ebuild 525 BLAKE2B b3adf8dfe3638b9ce6dbfaa81790fbd278f461593556c394ae498dbd2bf81ecfcfdefac8f740f1825823b2f544f3610937397e894369d3b5f094c625af116011 SHA512 b34b34cb20cd906e4c3f69e3e31ba74b63ef6dac750b6e4d1080d7ff5311a3e138d656ef5dcf9221dce5b5cfc6213a8f0725ccc6c11d5d11cb4b23e01daa1e66
+EBUILD pydiff-0.2-r1.ebuild 532 BLAKE2B 1e99b4f14692761c232a2ea23c0204a27fdafea61b3a4ce5c420b10880103db0005de235b6e9eb29b33cc141cfe845d3916df3ef515e0bc3b6928ab721c35e27 SHA512 f2669189edfad5221e016c01c1f4108f453e8b0a3a086047a0f4e7c962a92883f344e9ba842842aa8c374eaa02593feb70f9a6012fb1df958874e3fc1f707544
 MISC metadata.xml 373 BLAKE2B 8e20b47c64105d9f29c7beb15868eee311dc1f6bc49645729b780629d1e7d26ea7296f0768b29de4f4cb9df2e629d25d100409e646f30f336608a7996364ba34 SHA512 cc56455c69ef9816eecb5ca62fa6f660ca124cae7d62d58006133a9d9af79aa4bc45e572ca1d2cf5d9b64c7f7617f62b94b573b65d799327a2088e1f80902402
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
index 964cd9b15ca3..32ddd1bc3ffc 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~sparc x86"
 
 python_test() {
 	"${EPYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index 2819c58511fc..cdd284a3146c 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -1,7 +1,5 @@
 DIST py3dns-3.1.1.tar.gz 29981 BLAKE2B b8f1aaeb95764f4d332ec05a367557a24fdd9171e98349668995687052cbd392169a76aaf24e3d29c94ca1c232f04842b84a2320eab5e553de12c278af23975c SHA512 5f22ba12db502f997be4c2479697cc21fe15aac218da1d347bd400a3ab73d86ad32b57740292a10eacb73e07eba977f67b881e59be16f902afab47053efd6c6e
 DIST py3dns-3.2.1.tar.gz 30691 BLAKE2B 336ed91a3bf8b33db258667ac96eba6df361bb2a8f24c433dbc6754ea32a7284ce0463c392c1392538eed9d8bf9ea3f09400bc08f1970a7c96c52bf072606718 SHA512 22f16c571f9fad02a70a8e0bbbfd802f4f9af23946edb78e15f69f23e57411369274945a1dea5603acae1fc1eb404e5445207c541afb7864a60b92dc4d5477b3
-DIST pydns-2.3.6.tar.gz 28220 BLAKE2B 81d48c57bc90641c2e1667a951e3af3dc75dc1055e6f3f7b45e57d66bb1d391fc55ef0fa9fd261821de22c9119564cfc2b5a18f7a9780fe708b676c427824261 SHA512 261598c085c7d9f7adf5ce881814e444cdcf48a946dc17db467268ab6164f6045c204507cc58eff8e6f826b9786715ad2a9e766a72193ac8666969913180954b
-EBUILD pydns-2.3.6-r1.ebuild 1203 BLAKE2B 77a25c92f33ad293a92442c2ca1f73679ab8371decc41133b19f575336e031a33497b9010e5e349fb8ecbe46c425b2ddb75b424908d47f535c3f4393cab049a4 SHA512 0a04f978ccca14d006d4acfd6a710ec0036a114838f742615273dfa33dc7cd87c2a5775ce520fc3c8f4c1ab5e422b23012668b1090d95acf24eb0d888dda6fdd
 EBUILD pydns-3.1.1.ebuild 851 BLAKE2B 37571b62035bd609f1741a5b44968d0898e9076badd60d71e6b3bbb8364d13171ed0fd5fcdd172d381596cd85d1943bb848f498227ad85e014fc178a2cf9b06b SHA512 261ec06fba2111eb45e63dc2762cb46f459f28f726f582f3b86fa7dddd495f1bbfad303bdfac8a06c878346a2470ce533e665daba2da790641fcc6ef7cbb0086
 EBUILD pydns-3.2.1.ebuild 756 BLAKE2B c5778de45438146309d7c1f6630db9493972db23d2811c53a703a5b924a77e0ea3c4870303078f93c456623df5dae01344151a3a3c2698ac03cb76c05a527c7b SHA512 bbbd42c42203e03c1410f27ecda618013d35ea2456d80ba441c2ba4059a7346fb7dc180c09204d6d493a6bbc43febd20196c81702b003d70956affabb386a782
 MISC metadata.xml 662 BLAKE2B a86ca878eddec2ae971f3fdbda533d9fff639c7619aeb25997bf335de25d0738c9370a1b68d6e6fd8fe5eca6237d124a0fa629c048ba9e1772b42e42a1b0edd8 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821
diff --git a/dev-python/pydns/pydns-2.3.6-r1.ebuild b/dev-python/pydns/pydns-2.3.6-r1.ebuild
deleted file mode 100644
index 39a11692e28b..000000000000
--- a/dev-python/pydns/pydns-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for DNS (Domain Name Service)"
-HOMEPAGE="http://pydns.sourceforge.net/ https://pypi.org/project/pydns/"
-SRC_URI="http://downloads.sourceforge.net/project/pydns/pydns/${P}/${P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="2"
-KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86"
-IUSE="examples"
-
-DEPEND="!dev-python/pydns:0
-	virtual/libiconv"
-RDEPEND=""
-
-# Funny a dns package attempts to use the network on tests
-# Await the day that gentoo chills out on such a blanket law.
-RESTRICT=test
-
-python_prepare_all() {
-	# Fix encodings (should be utf-8 but is latin1).
-	local i
-	for i in DNS/{Lib,Type}.py; do
-		iconv -f ISO-8859-1 -t UTF-8 "${i}" > "${i}.utf8" || die
-		mv -f "${i}.utf8" "${i}" || die
-	done
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local test
-	for test in tests/{test.py,test[2-5].py,testsrv.py}
-	do
-		"${PYTHON}" $test || die
-	done
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r tests/. tools/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index b008681b0328..8aee2367e33a 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -3,5 +3,5 @@ DIST pyenchant-3.0.1.gh.tar.gz 75730 BLAKE2B 499638a238fa00510c9fcd3bc3d91c6486a
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
 EBUILD pyenchant-2.0.0.ebuild 928 BLAKE2B f717a3d03275b4bf1ca21da816bf36e2361c57dd2ce4e8f5d643151ff14c46a72a1ebc08e9727b27d585dbcc57896b31579cf7b8bb4b1913970ec0d20cf663bb SHA512 fac06375830e23c7066a18926ef9218fcada08014a4f5b55ac2853c3540ebc98791132db9cc68049bcb503804f0e9816c689aaaff890d09e2dbf770c7e17374d
 EBUILD pyenchant-3.0.1-r1.ebuild 619 BLAKE2B 7e1dcc4f68806f428e5aa93efd61f68fbc45a372524c820148751ca2701634e509068adfa8bbec70778cf14c6549e72ad62ba13afa988d186308424a614bd67e SHA512 dc3d9ef9d67b4ee82eaa00be5d4db5cc9f84f399a0db8faf379c7a1e377eda8d060b97b88ef2deb04abf6384c7c5c5b379cad683610df0bd06b417f9ed378200
-EBUILD pyenchant-3.1.0.ebuild 619 BLAKE2B 7e1dcc4f68806f428e5aa93efd61f68fbc45a372524c820148751ca2701634e509068adfa8bbec70778cf14c6549e72ad62ba13afa988d186308424a614bd67e SHA512 dc3d9ef9d67b4ee82eaa00be5d4db5cc9f84f399a0db8faf379c7a1e377eda8d060b97b88ef2deb04abf6384c7c5c5b379cad683610df0bd06b417f9ed378200
+EBUILD pyenchant-3.1.0.ebuild 618 BLAKE2B ce211a41b53a873ad0a33b963116aa09c9bd8b6ec8a2cf630005d0deedcd8d6ebdb796f4606fd51be05b951485d3dfa6face6b8d02546a6f6f84759d32dd2f18 SHA512 0453edd22dbd75912a79318b742aad166ab9af039dfa80e7a86f9a208617d5a375df01cb0d2b96b0428e2b906213621a840125afd1b11e7daa6e795e352b22b3
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-3.1.0.ebuild b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
index 466fac197d5c..ec2269fe01ab 100644
--- a/dev-python/pyenchant/pyenchant-3.1.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 7c06a17dfbf8..413fd5833acf 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,4 +1,8 @@
+AUX pygame-2.0.0_pre10-py39.patch 1174 BLAKE2B dda7880b7a57e62612f072ed25c9c661ca63665d94d3a8fd9bcb2d95683da80d215067e63925eb65d98b4bf13c53845b7093011da42c4403c65bb95253a6fecf SHA512 91900ab98546a5339fcf4d204e3d049de9ad9bcc929dd75fc39629d873532d9e486f35ba0236e74185e1b7298016cc419c5ca1d463af80ee7f425244b7f51ade
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
-EBUILD pygame-1.9.6-r1.ebuild 1776 BLAKE2B 576578ad6c2842653610af100ede751d7881bd3ae7fbc4926589e7485769c43e585a343505c9044d9ec9195b39343b3da2113e8f8227aeb2dec127f4089f6f4a SHA512 51807b684602cdc50874cb1ee1b693a47ab197a5f03c09c71b76ee6cfc6878bb2aaea024ead405213f268c286e3ce1d8570a57a3dafa76a8ffab540598904c8b
+DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
+EBUILD pygame-1.9.6-r1.ebuild 2107 BLAKE2B 663c13a8a86c32a66a8038f953f6405f450321f6e4d99197dea20a98942a83760da48642104dd483df06ec2803dee7ad0a9e9d25f81cf2a5e427a0ebebcc41d9 SHA512 1db25d70ed50e249f23ff28b95adee78601f27de7ec6f2f69a335bb9f061855e984833951845a9d4ed36f3a3ff5fa997fe6e49d545ae828bd1fff66c194a3a85
 EBUILD pygame-1.9.6.ebuild 1764 BLAKE2B c70233d00aed5294fa88da407f836ee06093009855a7165fd735a9f260e4f588339c0e56f9c934f0d74b14d65e703c491c21de481fbceb3402ecedc677e21c5d SHA512 50423f254afef8348078a141e2ceef4e3032343face6695be6d37d815026fc1e99c09c86448636ad29389b174f36560aa9e1ee58269e6a28fb1c01c4a979bc03
+EBUILD pygame-2.0.0_pre10.ebuild 1834 BLAKE2B cc73979a27f3af53130c184958147015db1b769b8f2ddb97dd3921c4aae9e72b65a0f125a246d00df870119020fc6fde1c89f017f7d72ca4de5dc0eec1e19585 SHA512 84b0fb7c2bba04335f33c86cddb4cca6941db0a8a4834bb428389884e3e00423d36161d2fac0d3d5f2b83e72d8d39c26e9354b038af6e895bf8411ad1fe12127
+EBUILD pygame-9999.ebuild 1638 BLAKE2B fe75a0c2d94974980b1b6462c8a3e5bd08b881606a541666ba6642304634d8a688a2dcb746d92854c1e68164b9cc07e904f454bcb87eff7315ae25f8767f72a4 SHA512 d5be31c553fd9bb1f4fab7084ea7553466086a6f4f68322797fc62c573bf562dd055bf9f33cb2deee614061224f39ac8e02343dfbce52c84b4abc204dee058ab
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/files/pygame-2.0.0_pre10-py39.patch b/dev-python/pygame/files/pygame-2.0.0_pre10-py39.patch
new file mode 100644
index 000000000000..9cfaa476db39
--- /dev/null
+++ b/dev-python/pygame/files/pygame-2.0.0_pre10-py39.patch
@@ -0,0 +1,34 @@
+From 159908e5726c3df5df58429d1ff3113137c57f98 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 8 Jun 2020 09:35:41 +0200
+Subject: [PATCH] Replace long-deprecated Thread.isAlive() with .is_alive()
+
+Replace Thread.isAlive() calls with Thread.is_alive() to fix
+compatibility with Python 3.9.  The new method was present since py2.6,
+the old one got deprecated in py3.1 and was finally removed in py3.9.
+---
+ test/threads_test.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/threads_test.py b/test/threads_test.py
+index 300f6a9c6..59ab5d488 100644
+--- a/test/threads_test.py
++++ b/test/threads_test.py
+@@ -41,7 +41,7 @@ def test_stop(self):
+         self.assertGreater(len(wq.pool), 0)
+ 
+         for t in wq.pool:
+-            self.assertTrue(t.isAlive())
++            self.assertTrue(t.is_alive())
+ 
+         for i in xrange_(200):
+             wq.do(lambda x: x + 1, i)
+@@ -49,7 +49,7 @@ def test_stop(self):
+         wq.stop()
+ 
+         for t in wq.pool:
+-            self.assertFalse(t.isAlive())
++            self.assertFalse(t.is_alive())
+ 
+         self.assertIs(wq.queue.get(), STOP)
+ 
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index 0aa0b86bea9b..253ffc048c4a 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -12,8 +12,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples midi opengl X"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=media-libs/sdl-image-1.2.2[png,jpeg]
@@ -24,9 +25,18 @@ DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] )
 	!X? ( >=media-libs/libsdl-1.2.5 )"
 RDEPEND="${DEPEND}"
+# util-linux provides script
+BDEPEND="
+	test? ( sys-apps/util-linux )"
 
-# various module import and data path issues
-RESTRICT=test
+src_prepare() {
+	# segfaults on Xvfb
+	rm test/scrap_test.py || die
+	# backport from git master (clock() isn't used)
+	sed -i -e '/from time import clock/d' test/math_test.py || die
+
+	distutils-r1_src_prepare
+}
 
 python_configure() {
 	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
@@ -52,8 +62,14 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
+	local -x PYTHONPATH=
+	distutils_install_for_testing
+	script -eqc "${EPYTHON} -m pygame.tests" || die
 }
 
 python_install() {
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
new file mode 100644
index 000000000000..e0019d48ec64
--- /dev/null
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_pre/.dev}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+SRC_URI="
+	https://github.com/pygame/pygame/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/sdl2-image-1.2.2[jpeg,png]
+	>=media-libs/sdl2-mixer-1.2.4
+	>=media-libs/sdl2-ttf-2.0.6
+	>=media-libs/smpeg2-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5 )"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# util-linux provides script
+BDEPEND="
+	test? ( sys-apps/util-linux )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	distutils_install_for_testing
+	script -eqc "${EPYTHON} -m pygame.tests" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-9999.ebuild
new file mode 100644
index 000000000000..9a1c6f7040a3
--- /dev/null
+++ b/dev-python/pygame/pygame-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+EGIT_REPO_URI="https://github.com/pygame/pygame.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/sdl2-image-1.2.2[jpeg,png]
+	>=media-libs/sdl2-mixer-1.2.4
+	>=media-libs/sdl2-ttf-2.0.6
+	>=media-libs/smpeg2-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5 )"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# util-linux provides script
+BDEPEND="
+	test? ( sys-apps/util-linux )"
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	distutils_install_for_testing
+	script -eqc "${EPYTHON} -m pygame.tests" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 277ad3e08a45..31cb7b5d0ca0 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -3,5 +3,5 @@ DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9
 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd
 EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 992 BLAKE2B 3db7b7f60e3dceb0aeda3b74c8dd9a06bc9d9a75b8fd7be83425c3be43e9d162ea5dc4eca80425c83eef1e90cc4674e7c6f7bcf6d75591d2c1e0bbcadcae3867 SHA512 3d142c9e99ba744c550b8a598eb539087af08d0a18c5a34975bf034f646f955cdc66e8101288144f0b2be27c0053fd4d7b9677c1fdc4ae978916f5ac8adab74c
 EBUILD pygame_sdl2-6.99.12.4-r3.ebuild 1002 BLAKE2B 0421f75bedbc27a02f6701d845bf2e418e36e656a451dfc73b96002f1ff473cf9da176029c43ecbbb7c99dda4f745a48bf554dcb9266fb7265915eb3be4da439 SHA512 8e9f5e3cec0e0eff03ce356c116838c63b37ecb343fdde27c5851598d94028553eaccb1aaba77ff7815fd454ec0596c694a712734e9eb3c60ca44f7e4de4b675
-EBUILD pygame_sdl2-7.3.5.ebuild 941 BLAKE2B 9d365f8ef70e371d8dbd2893b71282f4c1431d43f76e20517b5c69c87576642900f4f56e345970945f0e0650ac16642e06035ac2f18e6a3f4f63e3ec335cd4d1 SHA512 dcd3a8f4b18abf07214a6dfaa4532ff23a41a691f58b2ad286308602bd7d6c2db70d05f3c51dace2ac3239092273c74aa611a872a72580d39ae74d2bf00288ab
+EBUILD pygame_sdl2-7.3.5.ebuild 939 BLAKE2B 28f6647b562056c8c7b82b7fa4cb0460a31817d31797391bb4b36c87fceebdee3b5976ceca54902f355ece3907d89db263dd92691f400635165cf5f61c751d3f SHA512 06bfc457f505774dd6625211093068ae76c81cea966848ba4d50dfc2cb7919f9b7fda70331043520247a6af4ec7eb4b82095e64c1f242f697816319225395bee
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
index d774c961920d..652dd7b262bc 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index b9666d8d8300..d748741d916c 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,5 @@
 DIST pygit2-1.0.3.tar.gz 501720 BLAKE2B ddfe228bb50df08c1b5e880f58be6b0ae111a10235b695ce93ef04b685507bda90cdccdacefd5400807cd19bc9c63b49061c2da73c89641fe9641c52a4ed16ab SHA512 debf4018e6daa938f44cf22f2acec1f850156e30ac44052e2edb8257f86a60453428356851cc495ae234df9cdbee922a6a7ad7886c9a6e3746b7315c71f0a3df
 DIST pygit2-1.2.1.tar.gz 235852 BLAKE2B 997c54359c87bdbb5338d6524ca119a058a2dfa9ec5079abfeac5e3f1312e7fe0b6a532cf3dcea6a2b317124337746b9e4fbaa71585bc88a8afa37f8b74a7f97 SHA512 2491892e50d9298d68c2f90b3c4b23c87e51995ccc29e285eb2f868f5e34d2568d5f554818203bf2c735179aeb197e3b7aba1be88e72a6526812e3ee2e0b4348
 EBUILD pygit2-1.0.3.ebuild 962 BLAKE2B 6e16fd3bdba8102c51de84d67c050d074842c458e6c15424d8d7c847cee5d889fbe26935f35a4c10572f5eae0cff02d782c1716e454f66a37d17f00afe97b85d SHA512 d6dfefa43f8a0c38334fd7192fb1e27f2649967cd278e008c9a046797149f9c97afa1c6a7e616d4871887efdafbeff03db67998cf600a9e673d95110d620f868
-EBUILD pygit2-1.2.1.ebuild 1009 BLAKE2B 36e20c06be7476238c893c7a73ead825c3db46d9c3c54f5cb98ff31c6b2129a06cbf2930457539515b86752171240c8a1db138c5a456377a62f08faf73feab49 SHA512 0b58e7364f05cc2641116769ab47aa21dd5255bb2af446a20f333a16b219de92529b13fdadd9d710ab6c8f665a30570922306e8f9f80ad5cfbf6912b5e1c036e
+EBUILD pygit2-1.2.1.ebuild 1007 BLAKE2B 15edcce1e650b95e0d035f927c4532d25dcfdc7c34543815ed28c33e129b581c10c6d740a4e685f5eb483d5f751dcc545cbf64f82cd9c802b655d2b1b8f15201 SHA512 fdbcc70a204200c2515ba9cfe7f163f06453c4cbe9557acd87bdb3b4538dac0e30efbb16ba0dde654f1b380b2e0c1e151caf44a3b86a784396592063775fe2b5
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.2.1.ebuild b/dev-python/pygit2/pygit2-1.2.1.ebuild
index b9452ff5064d..301d38422032 100644
--- a/dev-python/pygit2/pygit2-1.2.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 97aae795f126..c47618f57478 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd6
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
 EBUILD pygobject-2.28.6-r55.ebuild 3539 BLAKE2B 872ca364cdb0a63ffdaaf22fbb61720b5b12d74b794d8ce33a844ce533d6ffe8960ba5f27cdc17cbdc8243a16ba7878431a22821adfc957975594de0742a21ab SHA512 793f82faae740fa25d871283a7ea83b1c2ac6913bce191a616bd66c8d142d2c0568c6f9499f301ea48086d3811b0efd277b7e010a83e5d9c6b9c640ea6dff825
 EBUILD pygobject-3.32.1.ebuild 1773 BLAKE2B e8255cf6550b6a7d8f8dd9533871befc6de86713dc9c52b767ee3b9d609944244c3b9f8ced5a8d3621673cf37a3e357d2bbea7c05b967f3ea85b20fadf7d234f SHA512 47cd7b27fdc1cb596f8bb59bd231f7cddf08df5519f1efd9a7bdb3de679c10ee7f7454e0ffc4786c0073865029a97fc1932c201ba127d0c573375e1120b63a53
-EBUILD pygobject-3.34.0.ebuild 1768 BLAKE2B a2652b7ee11f9a48815123fdd3edceb3062ca5ae859377712bf53367b7ad0387455c90b51168f34084e4ce4b74a3e07a913e8fd819a0ceca822f27c78250d27e SHA512 1e236eceefb55177591a0c50953a46e43152ceb5f50d72827d5d36d891dfc2094f689b7448e86045a742d962b5cb5f270a9f95d8b3414e1653f6739d952a8ce1
+EBUILD pygobject-3.34.0.ebuild 1765 BLAKE2B 442607ee78e22ade2a763135bb16a3f4499aadbd85470a3f3ec6ab74c76a0cde149fbb971069caa8530a84cc6a2a9ca75b9c9b240e0888a3790d96a7bba743ae SHA512 8969a808777fb6654c54b4e0ee1a4c3b8c4cd8423ad54c2806ffcece2455389de60811245e05d76153c2708a2d0274e28e27b0f44554db228d1fca2856304c6c
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
index 6b48cff12cf2..ddf1ed706bce 100644
--- a/dev-python/pygobject/pygobject-3.34.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit gnome.org meson python-r1 virtualx xdg
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index b8726293114d..3754c7ec85fa 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,4 +1,4 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
 EBUILD pygpgme-0.3-r1.ebuild 531 BLAKE2B 95cab4d72b72ad217b3b1986214bcb5d88f8ae3da0228612912dfbb91e750b5625c902bb6e6bb9fea8cb595159625abe22742d63d26abbd361eaf1046a152b61 SHA512 77e3857e7a98e45751dc4a6ce06610f7e5460893666a7147b20db357732f146f9a1f355984f2403ab709d7d7152fbb3192b9b40016f5fdf6036c89742bce2689
-EBUILD pygpgme-0.3-r2.ebuild 538 BLAKE2B cfa5910674ccea7146accef30eade13f263e78b126f0e3291ff8494be5c0257eb75e8407ddadb45cc4ad64a6d391513cacbc0abfa4a07c8c5f6f4c409e75ea02 SHA512 9ff4fff344ceff2b4395b8b611f5ce61db5bbcca3c49bbf5f698b717d3de24ff2cfba30bb47868290b89b4c661a6ae260c743d455f33e738b715007eaabe23de
+EBUILD pygpgme-0.3-r2.ebuild 535 BLAKE2B fae960c24cb94955f392f7831855912617ead0836f81efe3a9b9ed792ae9c18bd0e3d0ed87153511885042bcfd3c6995bc8714b7ec1f4239010e3d410823f7a8 SHA512 87c8d3d11c4b88d3fdfe072409e60cafdc04149f9a7b6eb3e7728e13e399887cf18f135a1e0b7d70214f26138fb1b306cff82e0dc64c743937e8f1691fa75f53
 MISC metadata.xml 550 BLAKE2B 93d93ed6170da174718a86d4f2afbe0f1b39d51fe49393ed45b0956ef4c55ee7b74d2376612dd3dd3fd839692bf80e6006cfc87cf68ccf155dea5b6e62cf744b SHA512 aa2f009654855d7bd18be6f2d7f7228bf4b7b532fded48d03173324d26394a1342f0392a373680364387c403210871675763c06e9bbc76e9837f620434dd4030
diff --git a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
index feeddfd94ea0..35ee8e0e45e4 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="app-crypt/gpgme"
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index a2074a578aa9..ba87d01d7995 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -6,6 +6,5 @@ AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f70
 AUX pygtk-2.24.0-test-fail.patch 252 BLAKE2B 9d808e50d9e64f481cd8d83e4693a60f472d4cf75b3d356c49d73056939b25d48842a1a64becbb17220ac74adb466deec0d1a42081144c7f853a5f5d1c7fddfa SHA512 22965a5ccc14ba842551ca07ca31d3a26f246354e35a7a24f66c34ace41fa1ee51a46ab404a103a8824957d5a197469ff6762eb829e236269420ba1842cb351b
 AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-EBUILD pygtk-2.24.0-r4.ebuild 2785 BLAKE2B 4336886560b94516354ebb9d4c3f346a946ab743a600e3877bbf72bfb618f64f3cdc33c25a60c6e6de8222e24df80f58bd797f482bf52ff42b3b97ecc34c9dd5 SHA512 c7c50cc52ff3767f538536591182c71aaf47e3355e08ba1061e5ff1124da7da066253c3a518da766fb39d4bf30ad09666393d9165740eca33af3e781df98da1c
-EBUILD pygtk-2.24.0-r5.ebuild 2731 BLAKE2B 0b0790045b9f8c033b6c8f77c8aa8baa2c2debeb9732b955b0181b955309c51bc941760b0aa326c54d1c936e83aef320fef9941bd2ff15773d686ddda399321c SHA512 46407f9ff92b3a91fe0087a8b74bfdce0ea272403867893e74112837e46ce7defcbf6289c76c706ba305b206d0d053ae9cb12a1b704105fa868133e6dbce1b94
+EBUILD pygtk-2.24.0-r5.ebuild 2730 BLAKE2B b6f738a026ffd6d07f641df93c056fb7adf85a1d38a8bae7a3c6d6569a862131ecf87d5963376ed59987aac2db01ecec33a4eb4d0c1a114660b4e656c632cc87 SHA512 f6337281a99898b0d484344b5a0698e51857af12a2037e82af2017ebb877cd95ed0cdeb488113277a5b540fa60e417dc0113706429ca1e2fdd1e8cfd2cd89a26
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
deleted file mode 100644
index 6ee58a37e618..000000000000
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic gnome2 ltprune python-r1 virtualx
-
-DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.8:2
-	>=x11-libs/pango-1.16
-	>=dev-libs/atk-1.12
-	>=x11-libs/gtk+-2.24:2
-	>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.26.8-r53:2[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/numpy-python2-1.16.5[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.17.4[${PYTHON_USEDEP}]
-	)
-	>=gnome-base/libglade-2.5:2.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-"
-
-src_prepare() {
-	# Fix declaration of codegen in .pc
-	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
-	epatch "${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
-
-	# Fix leaks of Pango objects
-	epatch "${FILESDIR}/${PN}-2.24.0-fix-leaks.patch"
-
-	# Fail when tests are failing, bug #391307
-	epatch "${FILESDIR}/${PN}-2.24.0-test-fail.patch"
-
-	# Fix broken tests, https://bugzilla.gnome.org/show_bug.cgi?id=709304
-	epatch "${FILESDIR}/${P}-test_dialog.patch"
-
-	# Fix build on Darwin
-	epatch "${FILESDIR}/${PN}-2.24.0-quartz-objc.patch"
-
-	# Examples is handled "manually"
-	sed -e 's/\(SUBDIRS = .* \)examples/\1/' \
-		-i Makefile.am Makefile.in || die
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466968
-
-	AT_M4DIR="m4" eautoreconf
-
-	prepare_pygtk() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_pygtk
-}
-
-src_configure() {
-	use hppa && append-flags -ffunction-sections
-	configure_pygtk() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			$(use_enable doc docs) \
-			--with-glade \
-			--enable-thread
-	}
-	python_foreach_impl run_in_build_dir configure_pygtk
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	# Let tests pass without permissions problems, bug #245103
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		cd tests
-		Xemake check-local
-	}
-	python_foreach_impl run_in_build_dir testing
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
-
-	if use examples; then
-		rm examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	prune_libtool_files --modules
-}
diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
index 75f810067b23..eb77f4c41088 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/pygtk"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index c968242fd8f6..943fdd1873da 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -2,5 +2,5 @@ AUX pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 489 BLAKE2B c88ffa0b90c82
 DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0 SHA512 3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe9777721903799eb23a2d55d3b1aadd758870f8bd591f143a05b
 DIST PyICU-2.4.3.tar.gz 219819 BLAKE2B 5e4b9ecab9e726aa05ae4a30d3b277dec3a94a2e0393a7cd9a9f247c73f02051649f03079b3b5f6d5a1745f00d2dc367066de8e93cafe3291cce7aa09884d7af SHA512 77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0
 EBUILD pyicu-2.4.2.ebuild 634 BLAKE2B 16f4959e8b3584654c22d191318b43b347cdd78d76edbfee25e834bc687a68805a39d05340641bf7b286419b9e91a10f25feddc40e2dc64ff0e6178e58fc1e79 SHA512 3f9926f85534618794aa533fd6e99b76403dbcfcd06ced1c7fb61905727ea360269d014bb877f56efcc3c651ba8e882a3d09573a9f247378647b113a3a525ecd
-EBUILD pyicu-2.4.3.ebuild 542 BLAKE2B aa658daf092e7ab3fb95f094998ca3aff70522c92e97541c4d2317eb43b680f10c0c56e947a195f4706acca41c2d75059f30f4781395864ed54ec9f4a69849a6 SHA512 2b5d747be54374cc7318a36916ba32fba539d427169100871a90bedbec126e7be48bf35191b4fc82155417c697877be75618ce71962dbbe3ef83da3e30c5891d
+EBUILD pyicu-2.4.3.ebuild 541 BLAKE2B aeff740a3137edc2947e797c527e52b6306c283aa6610f23a827f3a77f47f7801922416d7b48c2aa79032f02eb6e254663507f5470a05201d99ae76a8bedb8c1 SHA512 d9d12f2f1a1982026b2955ce9bda2b687360176e3d2ebb1d6209689964d3d6f12532957973e7ca6ea057d16a3a6ed761e5fe6e8eeb9e7af282e0837e20b8d967
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.4.3.ebuild b/dev-python/pyicu/pyicu-2.4.3.ebuild
index 3dfb7f457c8b..62d9421eee78 100644
--- a/dev-python/pyicu/pyicu-2.4.3.ebuild
+++ b/dev-python/pyicu/pyicu-2.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 8a33d1c040d6..9feae0d92d2d 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 793 BLAKE2B 061d4ec46c2d2ddfbc50254783615793c27fcc9b7e9cd874d9674b0ccee7fb93f0ef6c87942dd3f2f2ebfed854770cbfae87fb81cb4308c928bf415cb413d248 SHA512 125bba7b381292a98de3bf18fc8ed0981a56a2479534c30796c05064b344fd0aef48b2cf355bbee967f0a20a4a825c4b65336f9b5fb18f9c4bcdff663faa1154
+EBUILD pyinotify-0.9.6.ebuild 773 BLAKE2B d78d5bf6c51b47bb3b5dc4d3ec87d4bcf7c93139725587c0fe51d3cdf165a0f13a21e7384ebcbc8c3b5f3d417d65263d0a2b44ac0f3484c2b67efd875081075b SHA512 1c91176a0671f9d99bad023d228eae67d127cfc24e493c93f2c5db6cd1ce52f1240fce86e2b994f87d9b28f5cb82eddfb4cf35ba95d2c087d58daa706914642b
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 765b6630ae65..5221c9f20f1f 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
 DESCRIPTION="Python module used for monitoring filesystems events"
-HOMEPAGE="http://trac.dbzteam.org/pyinotify https://pypi.org/project/pyinotify/"
+HOMEPAGE="
+	http://trac.dbzteam.org/pyinotify
+	https://pypi.org/project/pyinotify/
+	https://github.com/seb-m/pyinotify/"
 SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -17,9 +20,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
 python_install_all() {
 	if use examples; then
 		dodoc -r python3/examples
diff --git a/dev-python/pyjade/Manifest b/dev-python/pyjade/Manifest
deleted file mode 100644
index 4e9e957503ca..000000000000
--- a/dev-python/pyjade/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyjade-4.0.0.tar.gz 29251 BLAKE2B 0a2ffb949022e9bb9bb12d9a1fa7680650a14634158429b2256320b2a75acc06e6c2ee0cbcd7ffba1263f6bfbbd40b097d7bb99f7e3a8fef95951c413f6e515f SHA512 0a384b843d2eb5884f2690ed5bb9b9b253474568ff1e9faca356a5c50749bb53fb759a099c7719bef495dc7af0073f143afad1c0d6d68f0f61d63624506f12b6
-EBUILD pyjade-4.0.0.ebuild 824 BLAKE2B ac09e353a2deecf05af987f341d02f527f2ea8f85a416e0412144da4d8a785c71b3ac850a8d79e3f24389d7d023373bc2a4c3c72cd7655818268bb6d0e872f98 SHA512 bb1f4900fd09b14ca779f8d9630475b66054570ebaab6f5b1e0a5f16fb99223b27dd8d56615d64d6052336bf69c245dabc6b55bf80e67de20ca6f072519c45bb
-MISC metadata.xml 584 BLAKE2B 22bf5698fe68eb9258403988d1ffc4f1fd6532bbd598ec0c2252198af5ff39e6eb458bf26e5fb62fc12ed6877456268b26918f2fa195f63a6b01e999063fba45 SHA512 6a70d07be11b26ed7a5eb217df8dd8085df84b82fdc48c35889db2080b5923be1108feae6c44ec1dc99e87f0244870b20469b866f359e8b74d682c884394c620
diff --git a/dev-python/pyjade/metadata.xml b/dev-python/pyjade/metadata.xml
deleted file mode 100644
index 3fba23025053..000000000000
--- a/dev-python/pyjade/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer>
-			<email>me@syrusakbary.com</email>
-			<name>Syrus Akbary</name>
-		</maintainer>
-		<remote-id type="pypi">pyjade</remote-id>
-		<remote-id type="github">syrusakbary/pyjade</remote-id>
-	</upstream>
-	<longdescription>PyJade is a high performance port of Jade-lang for python,
-that converts any .jade source to the each Template-language (Django,
-Jinja2, Mako or Tornado).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/pyjade/pyjade-4.0.0.ebuild b/dev-python/pyjade/pyjade-4.0.0.ebuild
deleted file mode 100644
index 17d9fb8b211b..000000000000
--- a/dev-python/pyjade/pyjade-4.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Jade syntax adapter for Django, Jinja2 and Mako templates"
-HOMEPAGE="https://github.com/syrusakbary/pyjade"
-SRC_URI="https://pypi.python.org/packages/4a/04/396ec24e806fd3af7ea5d0f3cb6c7bbd4d00f7064712e4dd48f24c02ca95/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test" # Need broken pyramid, bug #509518
-IUSE="" #test
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-#	test? (
-#		dev-python/nose[${PYTHON_USEDEP}]
-#		dev-python/django[${PYTHON_USEDEP}]
-#		dev-python/jinja[${PYTHON_USEDEP}]
-#		www-servers/tornado[${PYTHON_USEDEP}]
-#		dev-python/pyramid[${PYTHON_USEDEP}]
-#		dev-python/mako[${PYTHON_USEDEP}]
-#	)
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 40aba02ffcd4..876363f8b7f4 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.6.1-r1.ebuild 1989 BLAKE2B 23e998a43f75c1e4484ef0c7cef2699e85e5b6f0f0b3333d3301c47881d9aa4289359fd02a85ec15a3834e2292057a434ec06287b1fe0e2f5ecba2bc0213e484 SHA512 55f23ea757b365739f7e4432464d1f883437578b1aeb0634585ae0962b09b30d0116b22f7e4c5ef50f3755c12a8ac05eab6fa68ec2d868d87c5d75892416c600
+EBUILD pylibmc-1.6.1-r1.ebuild 2005 BLAKE2B 14a0e3a2fc9697d5d7d380dcc11a47afdc726047c3cbaae42eaa61896d0af8ea76d152102d2a08bca411642b103572c24e01befaff499d506a4f73ac8a9d7852 SHA512 a6f1c461625d617551140f03ae51c4597ef24d9f904365822d334f0e5ea6273fe94e763a94415d218234cdbadbfc20ae1b2539c8bbc70b5050a4ba4eb577f16a
 MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 6c03e4c34f82..42727e34ff9c 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="doc test"
 
 # implementations to use for building docs, separate from PYTHON_COMPAT since
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index e50302421b55..d536bfb0b466 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,3 @@
-AUX pylint-2.3.1-no-pytest-runner.patch 395 BLAKE2B 06d770f92d8772afa9febed3281e70f3aa08ea50b31bf3aaf87dca4acb0a7fabfdae6b5481648ccb7ad6db6f5f9eec29f2da13bbd9689aa080aebafd9aabef51 SHA512 3ae8024c82d426d841106ad43d165524de243d1c72ecf5883d39806f735bff87087db4ac109dc59a3a164e218e3b75647877fb56d52ef8ec387884da2e4b5404
-AUX pylint-2.3.1-sphinx-theme.patch 537 BLAKE2B 62f83fdaa8c1ec45f8ef7b03e7aafd85a00358ebcd906f098294356ec0dabf56e31e00a4336edaf4c1b7c5823a555de1aa3314f0f07ae3f729c20ae93e0d23ee SHA512 c5168423de4bcaf945b4d17cd766056f4f1a9c93cb082ea76df25f4335fda05118bf1309b8f622876625a15c0ccdfdb47a2daf2a9da66f87ab4047d0d2e3b656
 AUX pylint-2.4.4-no-pytest-runner.patch 345 BLAKE2B e11b2be3eb2721817d118bc161fd0fa6e7fc36febf1fffaa78f9c5f7810c9e316e59db2e28d07c161a53df34c8948083da5e11915eab18a45039d90e61e4ba28 SHA512 b5fd6fa2a902219515ecb733e338bb0d0389d1dedb947853111c7e7c9c0c83b80e595d854252a344bec6c5a3da3f1976c7b510910ba1fe199d977d70efaff5de
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 AUX pylint-2.4.4-tests.patch 522 BLAKE2B 1ec6a2c49a111a35f50f755b59e0c288e4fa801204b72a0f4f8a6b4ec54fbb35e0bedfcecfae329cf39022fca6c35c99a1b3130dbf63bc0fe5dd6ebcc3a42205 SHA512 d7a22c0f4f9adcef0a3bbeca0321c90c1ebdeee678ff5f2fbb5b404514e110f69ae294fb3bbdf2431e932326d7bdedbefc5fca5cdf145f8221061eae15ff92fd
diff --git a/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch
deleted file mode 100644
index 4caf59bb30ec..000000000000
--- a/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a7b5e413..841a1c0d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -169,7 +169,6 @@ def install(**kwargs):
-                  extras_require=extras_require,
-                  test_suite='test',
-                  python_requires='>=3.4.*',
--                 setup_requires=['pytest-runner'],
-                  tests_require=['pytest'],
-                  **kwargs)
- 
diff --git a/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch b/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch
deleted file mode 100644
index 9353a90957f3..000000000000
--- a/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-It's not worth introducing a new dependency for a mere sphinx theme...
-diff --git a/doc/conf.py b/doc/conf.py
-index ada9ec49..2bd66593 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -99,7 +99,7 @@ pygments_style = 'sphinx'
- 
- # The theme to use for HTML and HTML Help pages.  See the documentation for
- # a list of builtin themes.
--html_theme = 'python_docs_theme'
-+html_theme = 'nature'
- 
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 4d79d7c61c73..6736de148533 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,3 @@
 DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
-EBUILD pymysql-0.9.3.ebuild 673 BLAKE2B 212b7d4936c89adc6426410428777b63a35dc5d43316a5a6b93c38fd0a6e46e375ffb049e2dd08414b3b77597fcbec01e3dbae4dd6bfdf074f0552d877e53d3e SHA512 20eaf4eee1ebf709cfdae707c5aef191d6a5fcdb68ef33cd13f5b448787bb4ec829794ee50431047bb5115555012fdbea198b319bcc259504bbaa6c906e1d569
+EBUILD pymysql-0.9.3.ebuild 2141 BLAKE2B 53cd7fa1adf3224e595e841339296441f31df2261fce0fbd1955bc903444eb218b89a2b8845ebaff4d9cd75bcd2fd29733d20cd16f68aed710e097c26922787b SHA512 3b854cd5af1502d81e6157f20044311152da0d2cd7fa471d88e68bdd284a380caad920f89594eb085f52da07d3e03d11a3a78fa7888d54e54263fbc8fdec7443
 MISC metadata.xml 553 BLAKE2B a3f93a6e059fcb457326fe8ca880b1a268be1d5d847a0bd8648156036428a5e2f6cbe47adda3e3cb220c236b4307bb0dba8ea616842437e2408407fae01c16bb SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
index e0580ba49848..7346a5ab5fb2 100644
--- a/dev-python/pymysql/pymysql-0.9.3.ebuild
+++ b/dev-python/pymysql/pymysql-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,18 +13,83 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Pure-Python MySQL Driver"
 HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-S=${WORKDIR}/${MY_P}
+# TODO: support other mysql variants
+BDEPEND="
+	test? ( dev-db/mariadb[server] )"
+
+src_prepare() {
+	find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	mkdir -p "${T}"/mysql || die
+	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${BROOT}/usr" \
+		--datadir="${T}"/mysql || die
+	# TODO: random port
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--port=43306 \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql &
+	local pid=${!}
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++)); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+	# create test databases
+	mysql -uroot --socket="${T}"/mysqld.sock -e '
+		create database test1 DEFAULT CHARACTER SET utf8mb4;
+		create database test2 DEFAULT CHARACTER SET utf8mb4;
 
-# While tests exist, they require an unsecure server to run without manual config file
-RESTRICT="test"
+		create user test2 identified by "some password";
+		grant all on test2.* to test2;
+
+		create user test2@localhost identified by "some password";
+		grant all on test2.* to test2@localhost;
+	' || die
+
+	cat > pymysql/tests/databases.json <<-EOF || die
+		[{
+			"host": "localhost",
+			"user": "root",
+			"passwd": "",
+			"db": "test1",
+			"use_unicode": true,
+			"local_infile": true,
+			"unix_socket": "${T}/mysqld.sock"
+		}, {
+			"host": "localhost",
+			"user": "root",
+			"passwd": "",
+			"db": "test2",
+			"unix_socket": "${T}/mysqld.sock"
+		}]
+	EOF
+
+	distutils-r1_src_test
+
+	kill "${pid}"
+	wait "${pid}"
+}
 
 python_test() {
 	${PYTHON} runtests.py || die
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 210fe74d23de..8004b0baeff5 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,6 +1,8 @@
 AUX pynacl-1.3.0-hypothesis-4.patch 879 BLAKE2B ad16a87df5bdcad6e07afc4474a0cae6284e8cdc547405af05b1b4bae32e3c01c9ca523f3045326335536f509cb72c7014d31ccee8a3ad8b2fffd3c9cd837935 SHA512 de3bffffd0a16934ec5653c850a2d9b2075468dd0ea59c646af0c2ddfc9c4dd2994413a917e58fc67d436d2add6d111749d4979b02e4bdb6b8ff4e946e283109
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
+DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
 EBUILD pynacl-1.2.1.ebuild 1022 BLAKE2B 00a0f5cb11a1e542bebb1cb0a0257902afaa91108c061aaf06b49482c838e94688ccc1dc9f477acfb6490208a562c9740e90fb6bd8ca351665e3bba6750cd797 SHA512 43ce2fbd3fcaba0e8607d454d1196e840528899670b90fdb8ffe6405a1abc508648bbeaa6ddfc5b92ea9b9e8fc4c88ebb9d52359cf90742dd6f3f88c30314af5
-EBUILD pynacl-1.3.0.ebuild 1100 BLAKE2B 1700b7c8d22e281d7cdaceba00fab934794e5efa0e0e5cdb6a363069bd11d76fabaaa3c95ef412d109cdfe60ac3803c8454d9014761b7fdca2e6407877ae52cb SHA512 0d7be99261588e6085c2ac68973bad98d529ce9e8242a6cc5e1267cd23bf46d656048046eb40ce34d544306cff989152269d20fe1c91e6972f34fc2a4a12c8eb
+EBUILD pynacl-1.3.0.ebuild 975 BLAKE2B f1466ee9c913c90b85b02055fb4d8d36e12529cf1399fb774161be152be82890736c920ba54ba3cb14d10f3bc192d1e5c28b396cd8c1be20454b6134105b26b2 SHA512 5b8a64705801c43e89100e04922f8cc1aa554428f1f17cd71ab7567c837fc9a04494d091069d26785e440a58684ba87ca3cf8aa86fa6442c89bb886b7a3850fd
+EBUILD pynacl-1.4.0.ebuild 973 BLAKE2B 21cc174bc442b444c91fe035635040379edf1d715a8f3d702d9129d0e2bbe420a9c2af0554a4ada10d1ae41fcf63c541eb2b50a1568ba8c2b5a96964be40eea6 SHA512 d6f7f2880f6654e9cfac6c7c6f098e8ca37256e06d9b0bfae32178cd655f13e1c790495ebbc11747c464bbd716e0b6e1d534fdf2ec36cea4f162cfbe7cbe9576
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index 97a32891a3b1..dfc8f7da7cdf 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python2_7 python3_{6..9})
 
 inherit distutils-r1
 
@@ -14,8 +14,6 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
@@ -24,10 +22,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}] )
 "
 
+distutils_enable_tests pytest
+
 PATCHES=( "${FILESDIR}/${P}-hypothesis-4.patch" )
 
 src_prepare() {
@@ -35,7 +34,3 @@ src_prepare() {
 	export SODIUM_INSTALL=system
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
new file mode 100644
index 000000000000..6f73a99639f2
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9})
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
+SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/23
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	sed -i -e 's:"wheel"::' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
deleted file mode 100644
index 14289dcfa72e..000000000000
--- a/dev-python/pyodbc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyodbc-4.0.23.tar.gz 215152 BLAKE2B 856c7222394b2a8efa4bae173189bf4753c800f1fc98c8054766243400574b3ddb4e45841892b6baf87c5f872de5c78c7a1a3d6b48c3aef9d38a68653ba14fab SHA512 1788fd1118e40449af730a99427c3188a01ec85592bc2dcc7a49fdf0d4332e27add62cfc5e6c20d635064d8ff28eb8b800621d8127e309ffcac4aba144b49049
-EBUILD pyodbc-4.0.23.ebuild 595 BLAKE2B 86d2b1f35d653e55c59026deda684877bcc3397b6c79283210fed83f5473240d055cbd35e57044b72ab00f56fd06ebd3fa3ea9db941cc73ff5f697e85b850bef SHA512 194b0a20952ff456de7395d4f397542e1d56e6449575adc50a0710c2461d62b0e6acd19ae066ab0966b8009594121e17e6e4642120bc98e212066321aca55a1c
-MISC metadata.xml 367 BLAKE2B 530fc01148229a40c7c1e062f3c277b8812a5c434b1a96112425906c6976aac3b4396c42faff69b2cd03a1ed1e5990453cee9d8f1eb8e355f9dde2d0b4f4d42a SHA512 4e776353a7d6e61d0572fe852830214d0ee0eafbd9bad6ba19851e093f413e7d5fcd7f8d33c7c75be107b98a3003ddf8432390694c7372b5bf7eae05379ea38f
diff --git a/dev-python/pyodbc/metadata.xml b/dev-python/pyodbc/metadata.xml
deleted file mode 100644
index 3bc6483fe583..000000000000
--- a/dev-python/pyodbc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="github">mkleehammer/pyodbc</remote-id>
-		<remote-id type="pypi">pyodbc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyodbc/pyodbc-4.0.23.ebuild b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
deleted file mode 100644
index 65341694ace0..000000000000
--- a/dev-python/pyodbc/pyodbc-4.0.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="python ODBC module to connect to almost any database"
-HOMEPAGE="https://github.com/mkleehammer/pyodbc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mssql"
-
-RDEPEND="
-	dev-db/unixODBC
-	mssql? ( dev-db/freetds[odbc] )"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	append-cxxflags -fno-strict-aliasing
-}
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index d3f1578aa881..0cd5884209a0 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,3 +1,5 @@
 DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
+DIST pyopengl-3.1.5.gh.tar.gz 3287132 BLAKE2B a1d683715f4a57c0374cac827e7bd9c93ca303ac578f50a71edff983c6bf3c32858be454bf6ac00f757c52a0adc3b7df7f03181abf69304ed3621d168f2166d8 SHA512 66a6e07b4cee4d80d5b01cd6a506b54995e499611979f8a02fef76d95d6178fe9644fa4ad794812599be0aad293424be980f4a9d47480983503e09887250560d
 EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 725 BLAKE2B c49fdfd3c6865a898bb3cf3e3054ae64276f0543cb4080a7972db2cf69a0f867f46504691e9f02cbb672fdf11dc4df536f343392b52006cbc64898dc4293c2a6 SHA512 266622db995831b00d9cbc47d4ed8b1bc8b6f46766ce73377042e6dc5727103ddbec82fcee350a1588488e98b6b31ea81d0d3feb4a7f78b30b5e5ea10eb22788
-MISC metadata.xml 302 BLAKE2B 6554bf56c24bed0cacaf261dc5323e9c84c14e86973aee7cf510973a7e07999f5f0c1c5f595c224dcbb9bcab9d182ab1779afa5b304e116faf240bd9073baa1b SHA512 73ee5965c95e1bf6f45c78ad638b946d36d5a34115aa3307d84e475f5ca86e81a60283d5b50ccad3f32771e94220a06f9b8c85413047560dd99185f2b5ce95ae
+EBUILD pyopengl_accelerate-3.1.5.ebuild 817 BLAKE2B c46499868e7fd8319de33466160167ba085c48acfdc59883e048696f43bfeb44abe7fafa569def8a3ce962e4e8e756689d65773d439c4457b1aafd00a4207eda SHA512 e8bfb0dcef3448dc93669ea406d4680ef7d516bb4bf6b7a1580c940d6533086bc1078873c6788181d75ada10eefaec2fb238c73eac82013e3b53803ec098159e
+MISC metadata.xml 375 BLAKE2B 91123ef3cc783612271173e626b10dbe2a0e4095d0d4d18d6ce506ab1986f41c6db068734187223e1a4f412396e2d7f5d17f3138d2c75066e7d6d869e0d7f774 SHA512 9e5aa22c4fe794cbd2df7dad59135ebf36deeb609b294db54339daa5791765c06bb8c8e99bfc8d85b7104a05ab98370c93fcfe81ea2e0257e20001be0240d967
diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl_accelerate/metadata.xml
index d6b7485e028b..48cc66f255ed 100644
--- a/dev-python/pyopengl_accelerate/metadata.xml
+++ b/dev-python/pyopengl_accelerate/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="pypi">PyOpenGL-accelerate</remote-id>
 		<remote-id type="sourceforge">pyopengl</remote-id>
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
new file mode 100644
index 000000000000..2f5bcacd5318
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Accelerate module for PyOpenGL"
+HOMEPAGE="
+	http://pyopengl.sourceforge.net/
+	https://github.com/mcfletch/pyopengl/
+	https://pypi.org/project/PyOpenGL-accelerate/"
+# pypi archive is missing tests
+EGIT_COMMIT="02d11dad9ff18e50db10e975c4756e17bf198464"
+SRC_URI="
+	https://github.com/mcfletch/pyopengl/archive/${EGIT_COMMIT}.tar.gz
+		-> pyopengl-${PV}.gh.tar.gz"
+S=${WORKDIR}/pyopengl-${EGIT_COMMIT}/accelerate
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 868032807563..d86417b89115 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,5 +1,6 @@
+AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
 DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
-EBUILD pyperclip-1.5.27.ebuild 468 BLAKE2B 08212fec2b2628b92777c222c9743f161bd662cdf71970e93dbad72f46173f80c1dfe42148d01ee7f7eae312c80d2369b7c92f9599f3f1543325685a5140a2e6 SHA512 9542d0b6bc9fe68c8758d31b8aa5b7aaa319f75defcf660d4b92ce9c59a305dc152a3a2fef00463aad589ca431d03173e63c2f52169c5c47e145d5a55429a57a
-EBUILD pyperclip-1.7.0.ebuild 702 BLAKE2B fbf175bf47f53c1990b5cf2c49115362ba07a3485c356875e9224f8991b1d38efb02ab9121f3f47071c14e7aeabeccdd4b3aae72245475994cb678c29658c861 SHA512 21f30bbcdb1cbe5f84104fc10651e4835f3ee11b85fbe5b88855bf7eeb7f080907a6cb76e413583811a6026e53fec85032b43b798a68f515c66336188c420200
+EBUILD pyperclip-1.5.27.ebuild 639 BLAKE2B 950a102de841fd8b94f9feae7d5dd0630de289dbda78210c01175ead24a45ad66c9a7a10420c6d3ef65e4a0ae3ab0fda23f8e1121bc331daadf22e5f3acb4b39 SHA512 48d1c73cb76d1029ccae18255f733efbaa009a17866b7a88b31f2b5b3cd9f11080932779520d9191416615b1ecc8fca923694b1bbe1d2761d0c099dbc9b1de5a
+EBUILD pyperclip-1.7.0.ebuild 1223 BLAKE2B 299fede05e15289a8cbe50859862e5a6cc1e10114e554cb184c554416107a91bbfe100797f7f4bb0558c9b0a0049c317741c2a387d49e39680db47eece5d0385 SHA512 d94bac216d464a6f886444d325eaf3e88d0369036c389938228f9db2893d2ebf381fb97d547306465e0c378be65f6b1c7258275cc2ecaed5e5a7f895531d379c
 MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
diff --git a/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch b/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch
new file mode 100644
index 000000000000..4f1a94955f44
--- /dev/null
+++ b/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch
@@ -0,0 +1,33 @@
+From be59ac638e26aff5204a32333f7ebe046003065a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 9 Jun 2020 08:46:46 +0200
+Subject: [PATCH] Make PyQt checks in tests more specific
+
+Test whether the widgets module can be imported rather than 'PyQt?'
+in general.  The latter gives false positives if PyQt is uninstalled
+but there are leftover subpackages such as qscintilla.  In this case,
+Python 3 imports 'PyQt?' as a namespace.
+---
+ tests/test_pyperclip.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_pyperclip.py b/tests/test_pyperclip.py
+index 7519d94..2942639 100644
+--- a/tests/test_pyperclip.py
++++ b/tests/test_pyperclip.py
+@@ -146,10 +146,10 @@ class TestGtk(_TestClipboard):
+ class TestQt(_TestClipboard):
+     if HAS_DISPLAY:
+         try:
+-            import PyQt5
++            import PyQt5.QtWidgets
+         except ImportError:
+             try:
+-                import PyQt4
++                import PyQt4.QtGui
+             except ImportError:
+                 pass
+             else:
+-- 
+2.27.0
+
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
index 15e303b5c97d..f1298bc162c6 100644
--- a/dev-python/pyperclip/pyperclip-1.5.27.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7)
-inherit distutils-r1
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
+inherit distutils-r1 virtualx
 
 DESCRIPTION="A cross-platform clipboard module for Python."
 HOMEPAGE="https://github.com/asweigart/pyperclip"
@@ -13,7 +13,20 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+RDEPEND="
+	|| (
+		x11-misc/xclip
+		x11-misc/xsel
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_copy_paste.py -vv ||
+		die "Tests fail on ${EPYTHON}"
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
index 67eff3efdd8e..8e4042f67f1f 100644
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="A cross-platform clipboard module for Python."
@@ -12,16 +12,46 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc64 sparc x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	|| (
-		x11-misc/xclip
-		x11-misc/xsel
+		(
+			x11-misc/xsel
+			sys-apps/which
+		)
+		(
+			x11-misc/xclip
+			sys-apps/which
+		)
+		(
+			kde-plasma/plasma-workspace
+			sys-apps/which
+		)
 		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/QtPy[${PYTHON_USEDEP}]
 	)
 "
+# test at least one backend
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-pyqt.patch
+)
+
+src_prepare() {
+	# stupid windows
+	find -type f -exec sed -i -e 's:\r$::' {} + || die
+	# klipper is hard to get working, and once we make it work,
+	# it breaks most of the other backends
+	sed -e 's:_executable_exists("klipper"):False:' \
+		-i tests/test_pyperclip.py || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
 	"${EPYTHON}" tests/test_pyperclip.py -vv ||
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 8fc1039f8546..b37375f58450 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,6 +1,6 @@
 AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
 DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
-EBUILD pypiserver-1.3.1-r1.ebuild 1105 BLAKE2B c5c1fc0b5b2cad1ee66e0286cde0f6f9d7b1130b4aab408388597309b0240c6e240a804b460e15a9de9676e74b65a58d2ab41797d45506502b751acc150b241a SHA512 e2cacd0306478965b2a692c45e2970af5d8e25c9504591aff8318f2c6b00d7efb9a55cbd971fead1029ef00109c338f01ef6d62b6939a819ed3f3948c96c211e
-EBUILD pypiserver-1.3.2.ebuild 1265 BLAKE2B 6ec3b594a3ada4345f41942d1024bc6a9ca6fe267a5d80043892293633ac0a526e917850f14be838c2e2453fea509294c884bd11ba4e5a32ca910ed3ed9def87 SHA512 4098ba64a16b7590e13973100d92fbb037ed8c22f9f43a434ab8543b621a97bd065aca1a89d2014a902d5c2921a11ed65906f713a0ec837abf17d9cc0b4e8b77
+EBUILD pypiserver-1.3.1-r1.ebuild 1110 BLAKE2B e403bad0f7cbec9f698509783fecefed3306064f1c51958891770b6eefdf7f79c314434c11e31fe4a3dea886f7c5b9b3247b694cf6e6f6de35992de7cdfdfa3b SHA512 9a35625332e2e1e33830912e339e22e2ec72bb958d9727a80c095e20f3513362b17b91f68f11c9322c931ed6ee52be73d7da3e2ab77b76a75236c641273b56f7
+EBUILD pypiserver-1.3.2.ebuild 1288 BLAKE2B faa730b7c6cb1a2865ee0a3feadd1330d19a5592cb4b895f57cfd57b8fc445511baf00bd4cc922f060515eb293e2c9dc8e80696af1fcf78a3d29a5ac677b699e SHA512 2f2e284d7ca72dca458c97b0c443cf501c060acebbb2ed64c8aaf5ee6b8cfe72d04ac0c91165ec61497b4eaa5ccded2f440ade50385970b8f85cb47bde34e8e3
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
index cde7613ca754..3c550ec559af 100644
--- a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
index 5fbff5dfc525..629571cc42ac 100644
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index bb3b07743d3e..23a0dee1f42d 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,7 @@
 DIST pyproject2setuppy-4.tar.gz 7947 BLAKE2B 882aaf98c37560c9dff577cd7392830a0fc3a4bb9a1ed774037582c3c9bf2e74d15bc2fcb9fe1eea221dc65b9d0f8f6c9d677fca1a2045214440818712d7802e SHA512 1721ea0ba9bbd579af88543e2487863803eb002ba2eacd7db7b7dfad663a87a1f8248afff92964fedc0d5edffa92929dfb3e613f8ba0ec884ee98e44fb38544d
 DIST pyproject2setuppy-5.tar.gz 8314 BLAKE2B 7cb93fc0d427603adb8439d7549c276e8792d5a555f0ed229114e1083e6d741493938fc03507f60eb6bf9809a65d578099a20b1c779d817f396bceea418874ac SHA512 b32d9f5eac6df24c3eb10878c7cf7c2b7945471d2f221877572a98d1b06cd28d3a61ed250e3724619e1afbffe86f02e23452e7eee85bd702c0a64d32e36d0367
-EBUILD pyproject2setuppy-4.ebuild 669 BLAKE2B cb4782795a5b614b67f8c8afc14ad8064d3a5d8cb50fc4c17f74669e72add6b00bd8024e5b0c3d24ef2b508f01cc5b53c3a1913e4da80701e3e534fe75b1f254 SHA512 2fec72adbb740c9f25492f53aebcf77d9b71bf36bebdf70b07d55728ec76df9dd12749257a6c54ead26dbd981c138fdc70b5f352dde0e3ca998135b9be3f1a73
+DIST pyproject2setuppy-7.tar.gz 9274 BLAKE2B 5394543aeb7b615cfef5548b530d136887d81bff8c40dc343529d3e316e2f8851b82747d59dc9bceafdd7f2017695f523c75a8b376e033936708f76c64ebdd7d SHA512 22224a63acb0af5558b63e90aa2e96243c1ffc2ef9c114b2e20b8dbc5b84abc468879822d8d20f8dd2f7fdc2ce4a508b5f84e661831cf9e99e383d89fe2b63fa
+EBUILD pyproject2setuppy-4.ebuild 667 BLAKE2B 10460232046081050716f4f181e5be8b862e5215dcfb0851e02596281f9b34f642d8216964731d7663730a58d2dd70a9934e7704f034a303788d5d8793e968fc SHA512 ada71311857f532cc1a28a7a22e2847eb891698e0711b6deedb5f3c9cbe080b2c754ce1dad75f2dfde48e3eab6a5a9e58f32885975fcd5c9e5e5af8c63ea5804
 EBUILD pyproject2setuppy-5.ebuild 673 BLAKE2B f710e85ba57a344c5b0ff22f7a2173ddfef9267d9ecf508822c765718c75651bba689fbbb85a479662062dc382c4abfb9b478ef441c7c77a0adccd0641a7e4a3 SHA512 a70728a7911c47a4241920c51caee7dec86bd7a1acec16da2cb1023f22e2317601f562daf0a3817f9f95ae809679ae376944e778f0ffe467b6e9bfe1256c8168
+EBUILD pyproject2setuppy-7.ebuild 672 BLAKE2B 9128e6fcd656a7c8536359e8cbdd25da81f4cde711dedb4eb367f46ca111f7440c2d8ad24eec37f2108f4be46cc436734b09db01142101134df6e904a7b2376b SHA512 3b4b1609714c519b43434d42c4510be8599197c71ae334bc0c501904b49a804b03905e4689b169a03c36e536d10a4ca85ee27990c38bb528f34312b03fd703ea
 MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
index af957bc2180e..d95e0231a086 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
new file mode 100644
index 000000000000..346f6735e4f7
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index c46bbd2cbb72..db7ab7937198 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -3,5 +3,5 @@ AUX pyqtgraph-0.11.0-qt5_only.patch 361 BLAKE2B 5c4f904df6b19bcf29c9e44a62340001
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
 DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
 EBUILD pyqtgraph-0.10.0-r2.ebuild 1219 BLAKE2B 6eeeeb6d25de6d0d791b760569eceafb34b5a0fa65af24a100cf9540ae45e0d8df327787f80581ac31504f6be32b5695a03e0238c290cdef6b62774ab5ad03fd SHA512 b5742c766f27a517867fbbe1b1b95204c984636f52975a47a070f00c739e3b4c300d7c160bb1558fcc8865b72e6c64de05ab4007b859634c432ccf1b7df2bf39
-EBUILD pyqtgraph-0.11.0_rc0.ebuild 1074 BLAKE2B 210fd58f645c5803ca33701b3d529b3924a3302faf8f16076e26fc173d5fc4c38a70deec546b24f343bbf55a9c0d69c96a02803d48f44d0e60afd1ffc97e3c9c SHA512 f6ccb6c519aae5f2f943f91f0c813c6e398f6203a21faea3e76c7c4c49742b4afda86b8981b22afef012cecbf4bde490d7accc853bad0504e65686eab475628b
+EBUILD pyqtgraph-0.11.0_rc0.ebuild 1072 BLAKE2B f62759d444f186d3cab758d8df0539a70d90011eebcfc3e4bb892d5fb13fca6705b99390cda6ae6b9e07370d84355bd639e0f08687385b7ddc6ed25f79d4dc66 SHA512 6524de9e2864b59ebbcdc34cbed34e128e285b6861f96c8f0dd43e9a8956a1bb7e636e6c97813e61e57c820822fd2f82b69e83ce2e66209afdf3f8d59ca7b5d0
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
index f13ada12b645..2259d40e1ec3 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples opengl svg"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 0422b894b3dc..9b762704ad27 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,5 +1,5 @@
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
-EBUILD pyquery-1.4.1-r1.ebuild 1170 BLAKE2B 177f03a22956d3ebe75f00caeaea31e8b96a36469711a610dcce3d1fac67ed2fb9dd26b6ea71285a2f20f5dd452a8f7398f9d1713bbe659f37931c49baa36d96 SHA512 b8ea4340a27983d5f6e82b8c692a5b1af76d039fd0fe7d26137dffaf69ed36c6af991601c02ea18e01606008fcebc65acecc193c5e327659e3849526a9b074f4
+EBUILD pyquery-1.4.1-r1.ebuild 1175 BLAKE2B 237c078f32e5b0b69692ba13e64fba4693da0d02f7ae7052f6f283182e5f5ed0f47881792586c9c22f58c346111ce8d170034e6b5c2e2961af794150ae98ec04 SHA512 b40c58327a0d68679c906c29b47b7002069dd32d46f0199c87edb4dcf646f4a008aa086b744a441e2b4a6749fa7f829925cfd1323298cf20f9242c24b82eab51
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
index 86bf2c88a3db..adc9c3894e40 100644
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 62dbea3f203a..4297efbb7db0 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,6 +1,6 @@
 AUX pyroute2-0.5.12-readme-filename.patch 332 BLAKE2B 37df4e22ef010582c9675a081d25493715b0a4cfd93c14320cfb58af576b189a282cf5ee774d821e24e9de1342e6af56c5508882b44fef1e63ac3111f70830de SHA512 9fe059bb14e7ecd98a9cfb749cc8dbaf68e52e3d1d0e66eb8a7a15a4b6f0161d4618a9b64fc20de4c15b4e5f750df82c648fd5169918c2f0dabfb9d3fac09a5d
 DIST pyroute2-0.5.12.tar.gz 425500 BLAKE2B 2b8f919bc7fc9caea9f4dd41b110e8a321406de998598408bbd12d6d62fcae009d01511271e462a4118311f12c54bf51696c0334da2ce9cb185688e35994b0a8 SHA512 6115826a43f6392a727fe2dde0dd24317f35c3a7af5e45459766c3fbe9853540c68f9a9a2233c266e866f3decd22dab0032117f687758f69b962ac6606d4cbdf
 DIST pyroute2-0.5.5.tar.gz 702481 BLAKE2B 7d9db1efe0d76e5fbca3f07d0ce666f919001fa26c220bd432c719aa6fc3a4d0148ea6357ed84cd5d0a6e47069994f35d2501365115b9c497674159098c2e5e5 SHA512 c7166e667b6fd21eefd34a01a0bba8467f3ae4d9526af32d5a6e96747c8aac7590da1097f1ca9b12390158e90ddfd6ff9f68c85765abbe179e8761658dda6b86
-EBUILD pyroute2-0.5.12.ebuild 733 BLAKE2B 0d507471074e6bd85c950b82d56de7d7ae5426a80eb85526b43b80a5d79739ab9fdbe2491d1846d6658786702f71d214244781b95c000e29b008214336e73e0d SHA512 4d7a9fad2d0b56359d5234e8552f70a5a86b6a40988ec337ce73005c594f5f68c618838b5e0ae8aa21cddefa1dd82eb2b9ac867d5728bcaefc13be46f8eea4b5
+EBUILD pyroute2-0.5.12.ebuild 731 BLAKE2B 8a6106536f09b838a9a90f78f24f2395dd744e5c3e8e950710259f156b761ab88ac56467fca9bea8606026ea7adc2c32b8a8a4904e912b939740a21a9c7f5f13 SHA512 05bdf4a47077719e5c0841f900dbe9cade00c50991515d039bea6d49177f97d9a2995376752d043c8cafa0ca09d6c4c22e8dd3c3a829b2b86baa07eacefed8a0
 EBUILD pyroute2-0.5.5-r1.ebuild 501 BLAKE2B 9f8a59ea1744a308202d7b7ffc619e956be512dc781397b38d21cdfece16a358ad6a7fff6ee09a81d653347065505c273a4107c948a56cadd222291ef72f8c5b SHA512 487449e86e115bfcef143615e2cfa8448f60f1547a393a17843baa83fbf387e52ef1479b7db094d89775ddbdcabf4fc7037dce7962bd70cf51a64d58cd98d484
 MISC metadata.xml 488 BLAKE2B 79dad1e2821167a54e6df2ce2b3aff8671e52b966fbd181703130ad2ff04ec8cf9d4ff4d0790fa9d96fea93f0f3586a0e4381595c74707511770be6ab3327a5f SHA512 28980431e5515acc723ed2fb6075848ec384b7365256986e6d3dadb3d39f2e6c6edb998b4a6f1067503805c57a31eb08108e9c8218e2167018444500ba1e182f
diff --git a/dev-python/pyroute2/pyroute2-0.5.12.ebuild b/dev-python/pyroute2/pyroute2-0.5.12.ebuild
index 09505762e110..101c5a98dd3a 100644
--- a/dev-python/pyroute2/pyroute2-0.5.12.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/svinota/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index fd3dabd36cba..d5d68bbd3863 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,5 @@
 DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
 DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
-EBUILD pyrsistent-0.15.6.ebuild 702 BLAKE2B 28e5d2cc1d2aa9af061a4d61efab24288bb6f6cda19553c34844d779aadee3b736c06507c0875e2d379aa99d49ef31dfd415a0fe158fcb58b0cd412e82696177 SHA512 0aec97038ae5a323b039f1f8b3491e7f1e2c895a01ea4a2b27cb9cf9e5892e01f91a62cb436f36286d8bf3d22a05aa4b39b269b3e9ac8802843789932dd5a339
-EBUILD pyrsistent-0.16.0.ebuild 664 BLAKE2B e5345b913b8d2b347119df73475357b41b307857550eb14d2c5bc37a09ded7339c98b6f03a170fdea35090b49937c2f17a57a2e68bb0b62099aeab502b858db1 SHA512 f8dcbe550e06dda2172d72a000afa8783b29c14c8e4eab2492a0aa2f161e8167c1fa58146ad870759f575fd3b56567a1e079d5e94d4b4d4bde2cc0b943f213aa
+EBUILD pyrsistent-0.15.6.ebuild 651 BLAKE2B 379b5169b1bf9ec52c6470d1398730189491c67ad65a0d756dacbd9cd8abb3a254bc29f3a415940380a2300c1e0694440d8176becadf236bf6051d1a03db1f4f SHA512 29d8d5250cbf300d3df5a9176631663e5f2849fb8347798180d64ac32a12a5a2381067591278757c81a572dd574819f6bd1792727e7903d5bb7538f63c5b84a2
+EBUILD pyrsistent-0.16.0.ebuild 654 BLAKE2B ad82b97f9dbeebbf6eabdc3f20bb76000e5bcb4a53d2d5b7aa22db3627923fb4943907e8a32c423c1ac9bcb7283730bc37d5b8c44a65d76daa335b33cd920683 SHA512 a9930a24e75a076c16e05a5e9b60611354224617c89dc882c21aa55d999ffef86f0925597fb85a39dcfabcd044a57e8627f6ff66f9e4f8e2005cf4556469e62a
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
index 015dba89df24..3ffac0b4f579 100644
--- a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 
 inherit distutils-r1
 
@@ -19,8 +19,8 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
 
 DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/hypothesis[${PYTHON_USEDEP}]	)"
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
index 6a882805ac01..213ff34df431 100644
--- a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -19,7 +19,8 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
 
 DEPEND="
-	${RDEPEND}
-	test? (	dev-python/hypothesis[${PYTHON_USEDEP}]	)"
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyswisseph/Manifest b/dev-python/pyswisseph/Manifest
deleted file mode 100644
index b9cd91d3c526..000000000000
--- a/dev-python/pyswisseph/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyswisseph-2.05.01_pre20160529.tar.gz 488382 BLAKE2B 3bcea971448b13c40f440473ce2da13ca18796ab645265ae813fed517ca7062342170e0526b48a19b8686ac82526a16654b7c8e4b7d2dcd8e854c116d1fbf911 SHA512 afec6ce93a34ee116ed5247ff0004cf7c3adce33b4e0f95aa251b6b533a8925340d6f6d847ab80dfb2cf75933939d282455e7dc1f812c28ad45a42f21ce1e611
-EBUILD pyswisseph-2.05.01_pre20160529.ebuild 650 BLAKE2B b27484fe9ee5c07e75d59b7e653600259fbeda3255f1d21233f1c399a384495250b3f80058841e8e5129d8ad0474fe51dca1c1ebd1f3513b752f52f6ef411e6e SHA512 916c42b9c52e7faa119d69a7fead4a9ecdc228707def0d2fd43891c8c7ea2b19888913cf68b12c5317d7f0264e258e0da2e2728688b3f9afe4b1644b25f35379
-MISC metadata.xml 511 BLAKE2B d88458ce79785b22bd75c3b39e845dc0a91cfb30aaaee7780e15b422edf1dd8fa0decf325238bbf34c469756fa31cba346a3cf8b9dcd7659a4a39bc967519f88 SHA512 b81b9b0110b7460c3a308a4a914ad59ccf21e1d5b003c898167b803b57720cb66e29d070d6998a6747d61039be9a364d907e517cee2ad31f7ad533e687d756ad
diff --git a/dev-python/pyswisseph/metadata.xml b/dev-python/pyswisseph/metadata.xml
deleted file mode 100644
index 90e4eddc1f38..000000000000
--- a/dev-python/pyswisseph/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <bugs-to>https://github.com/astrorigin/pyswisseph/issues</bugs-to>
-    <maintainer status="active">
-      <email>smarquis@astrorigin.ch</email>
-      <name>Stanislas Marquis</name>
-    </maintainer>
-    <remote-id type="github">astrorigin/pyswisseph</remote-id>
-    <remote-id type="pypi">pyswisseph</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild b/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
deleted file mode 100644
index a72e8ebba1d7..000000000000
--- a/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension to the AstroDienst Swiss Ephemeris"
-HOMEPAGE="https://github.com/astrorigin/pyswisseph"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/astrorigin/${PN}.git"
-else
-	COMMIT_ID=4f76befee7e39dff96b4c068cc6ce5fa66fb021c
-	SRC_URI="https://github.com/astrorigin/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index c26ee52f47e7..26ea4d44d095 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,3 +1,5 @@
 DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
+DIST tables-3.6.1.tar.gz 4641089 BLAKE2B 4ef44b1263f40babe6719bac911ab191e9cb0c58c377705b755fa83f1fba5af1d0fab10b0b45bd6af619a9dce4842a80afad8d8fbab64c3be4f35a1b3f117ee3 SHA512 7f018b70251095049bce9075be4e19f72efba9d39121a35c4521f634b1dd5b81ab6de47df3bb44ad6b8b2dbdbff4e6d0985ad1a7b2f13b44f920c0935e5830ff
 EBUILD pytables-3.4.4.ebuild 1734 BLAKE2B 0b9d317bd8a6074c7770f29fbfa8b10bb8bb7b7925cdf95eacca691449070f8a6fffcdd4e7d4258212b58291631aef89070c4b044ebb07bc62540b430969f266 SHA512 8c2383039512ad9ecbbff0e0eaf986dd2bca5781534ed6cd4d4c8ed63072664220adabb3bbe08b6a8ce9d272d92689b37d44d78eadac28ec0fc018dd65c8c1c2
+EBUILD pytables-3.6.1.ebuild 1737 BLAKE2B 9499f51855bd35998865af1439b803eac86c09936faddf3ec4059d6f3475a518043c3b817d6ba1dead77aa508d09203df219ef0367f62aa165224c7d6c638d27 SHA512 f0b2f951d189bb5d62d87fb754a525b5f4047eac1ea41ecdd020b20323be941e0073901df960eddec9c98bfff31e09c328b1744b0807eea386490a74e090fdb4
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
new file mode 100644
index 000000000000..abe2b97d2fe5
--- /dev/null
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="https://www.pytables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	app-arch/lz4:0=
+	>=app-arch/zstd-1.0.0:=
+	>=dev-libs/c-blosc-1.11.1:0=
+	dev-libs/lzo:2=
+	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.8.15:0=
+"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( RELEASE_NOTES.txt THANKS )
+
+python_prepare_all() {
+	export HDF5_DIR="${EPREFIX}"/usr
+	rm tables/*.c || die
+	sed -e "s:/usr:${EPREFIX}/usr:g" \
+		-i setup.py || die
+	rm -r c-blosc/{blosc,internal-complibs} || die
+	sed -i -e '/_version/ s/\\s\*/\\s\+/' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${EPYTHON} tables/tests/test_all.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		DOCS+=( doc/scripts )
+	fi
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		dodoc -r contrib
+		docompress -x /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/contrib
+	fi
+}
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index 3d2e548369e9..f4e1be85ceb5 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,3 +1,3 @@
 DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
-EBUILD pyte-0.8.0-r1.ebuild 791 BLAKE2B 4b4c216a437df69d55bbd28f8d972bdca963707f16fcce7f4e0e9c8dfeb1e4b166e85f529b7cf45b9ccdc485103a473852b100671c0b1bb85aac831950e94f2d SHA512 72f5154f696effd100bed560e9a7743f6da3b9a806a19f57f2ae197b08512eaf561088fbad93dd08a2ce37e131f0ac79d685675729a8d9f9443d80977b8584be
+EBUILD pyte-0.8.0-r1.ebuild 790 BLAKE2B 66bf21d23bcdec77740d43229fa4c31640ff8c9919df75f262ae60b235ceea25c776e7713216bf14d0d8408e61a0c0001bd74f0792febd506827b50456c74a27 SHA512 a84781dfaa5c64043b8551fa374017a188ec7d33abf5af5634b1b1ed39a208d211b6d630afa876cbbad7c1f35cc7d1aa38283a54fdc19ead37977ada48c3b9e4
 MISC metadata.xml 372 BLAKE2B 6e2290ce2905925561a7bb3bd42f754191dfa28b2bfe493d234e3944d9b80e1b7c28440105a95e0e31ba0d445979c235683c81b4ee4cec7930809a6ef6fb7cb4 SHA512 6ba189a1a43ff10537319bfdebf23046437a86dec5c6bb219e97076120b31e20aba0e4cdb8abe932c378d17c766ae2ae7a65d9538cf3926cb106bd20206901bc
diff --git a/dev-python/pyte/pyte-0.8.0-r1.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
index c3fd874882ba..8e31925771d9 100644
--- a/dev-python/pyte/pyte-0.8.0-r1.ebuild
+++ b/dev-python/pyte/pyte-0.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index f51c3edc409a..d024d281fdae 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 616 BLAKE2B fb52e1e2387c48a827b69c4e961eeba23e641f8636ef336a785b53a6cad3a196358d713bf70bf977d244aa7dbb84dabfcedf3f1b0e0ae5a665eb37109a54e8a1 SHA512 1cd7d534b77903382de1441d298317e54f4bbfc620f07f4bd402a24555907c0212eb6b3583e9650988607d71696f350d2bf7ed2254e0ff6cb018be8a98d6f653
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 533 BLAKE2B 7ddaadc87068932e19f7adfe23d484a2e8dd1c4fdc317d53300ed43f36b49ea89b9edeee6babda4e24de630fa940de793f8ec3ff4885329e6ce039e6df8edad2 SHA512 79624acb3947f27b97bf9b506623ce07ac49350fed8480251e67ea8e2cf11aa077701a3d7f00f6cb0c592a7865deb40e51fbfb6cb52367a21d5ee0467550d6c8
 EBUILD pytest-aiohttp-0.3.0.ebuild 608 BLAKE2B 15c3fe584a822ae28da6b01f91dbeb89b9fb7e2691164d585c4072128671289dfedce1b9e4dadad83342a18c7e2ce89ff4effc77e525d9ef862fb5109299974b SHA512 40409add5aacf9f266d658cff98be13321e4540f0dd5f367f9f61db4ea6078c8b834e6e1d024ee85d90d94afff48a7d071a5e4759d0451fd40690a2c16a20ea0
 MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index 733b6f0e1963..beda1c97ad55 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -17,10 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
 RDEPEND="
-	${CDEPEND}
 	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-0.22.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 2bab295d9e68..7b591e4dcc56 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -4,5 +4,5 @@ DIST pytest-asyncio-0.11.0.tar.gz 14070 BLAKE2B a97cc52a013e126c7aa48b21e8fdfb69
 DIST pytest-asyncio-0.12.0.tar.gz 14294 BLAKE2B f62bb025bd3e35b5b4571b232ae2dabe5ef42075fa98f2f5ba28f78f16d81eadeb68b7dcd11a9f8170c1077c331c7abbb0fadc02863458ef03d238b399e6f37d SHA512 2e69bfff3f0b35cc82381b841229749d309967ce1d36972933f5bc6d5dff45934608310ed3fa1805dc38ab41bf913a881493c28d6d0e9be733b624cd2fda97d3
 EBUILD pytest-asyncio-0.10.0.ebuild 833 BLAKE2B 7474a3709b045c8ba57623907eeb2fec75edff8f09d27be3ce9957c7dfc31836655ff2020a6c287a877df6705e9c11805bc33a870e8d407e076b3479f7cc6f48 SHA512 0211e34d00b6761465d543920a5341f5043317cc4d86a94401606647013efc3be81ea83e4d75ba9e1ef51f70ce00f26b8a590cc1d7635c4be7f24fd78a3fc3e5
 EBUILD pytest-asyncio-0.11.0.ebuild 762 BLAKE2B d55984ddaacc624f1f96457811448e4d3d9af28d8ab9ee5610b0def42beca68b2c6294afec80f55324451a623e3ed40151fac52f662eb35eaccb2bea22358763 SHA512 66f3e6661bf185adae6304480f4f5fec32ea0c8ea75177f8ce9111e00f87e7d8fc4b5bde230e7dfa3fe9899140d1ede0d4a1b42bf35dac5c8b8ba3dd887e8cb1
-EBUILD pytest-asyncio-0.12.0.ebuild 807 BLAKE2B 478caf0168ef0d604aa538954669fd0bbe0d60c79ce7e29ceb0dbd599444664e42ab103de90ecd7ada2e6e0b05822d93a15c46755fc74eabb7efddab9b171945 SHA512 7cb587abd9503c6c93d47d6e24bc2ed1b2aabec7d6b516183067d4d7b1562100cfdd9fa4ad316d78d4ecac7c97db70f379334afc5e1a0eb752cc107ff3189beb
+EBUILD pytest-asyncio-0.12.0.ebuild 816 BLAKE2B a39d5df1cca40426e0c8d65eebb86d3720b530ddb51f365837575f311f26bb2253b5ff930762c26db4dbfe6909e0e7f56c831d28392e3b17a76fb47324fd8106 SHA512 63ba162d11959ef59261923d376f863ff5eada602eeb24c5ca9a6e8a3ebaf73e0eb541c489bd133ddb5b2e80d70fcb71a68ba4ccd9ca18795d04569ab6609d43
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
index 7297c5e8894c..64dfa2878e8f 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index a147207f4920..5e99238d2d44 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 661 BLAKE2B dfc52486312e73c59d36ea21e5226926461f91eafc6e53b9baf61f5f878993a14bbf037cb33c71573abfd76cd7ade3549bbe94288d9afb2603a38ca1ca34ecab SHA512 2f7662f16b4d37a78c3c9b9bd21275f007a9307da4b547bc298276b8da857394b2669858a5e521d2503d055c6cad0dd68cd7b2a710171689f579c89bbefaf18a
+EBUILD pytest-expect-1.1.0-r1.ebuild 653 BLAKE2B 035de653d10042b0d42adabe9677ebe38add21b84d0de4e4df3de1478554013bfe226e74bd78600200b53ea2fe1947fd4793570a2ebcd97a62697c47483cffc7 SHA512 c80404793739f5afcd0187d4eebc05fa2e0011d68ddeb0e971c36511a06e0e4039aaac933ef7bac86e5f52e8c25623d3f4e291b4f980319b7f645538afdf3f74
 EBUILD pytest-expect-1.1.0.ebuild 685 BLAKE2B 9774b9b955ae1d19d34979e9c8c1254ae2aa5b65f38d1e186f4f043a75f4679a2d19a0ec46b2a16ee38ca6e3b70a1a3635c46ad62ceb1388453e3f9c0eee65cd SHA512 84c2d74b5255fe18f7c9a33f32a750b8aaf76a85019ae8e752ea074d35b4b622b3eeb8d62ef9868919853c43027943f1ea7215d977a761d20d86ae50a41f0cfe
-MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
+MISC metadata.xml 458 BLAKE2B b8e23df2621be3f2cf2818753ab7a18102fd3e1ff32e80aa425c50b36f9f7ea736a1e9eb9030920c2882e65bdb2372afb0ece371ee13dbb45b3be3144d73f8fa SHA512 a366c816a1513376742bf1d43bb4cc60df9923b3e191d169ae56ee9706f60cbf8edbe35a195f41fd214bdc4cc10fc35c106d798845b3d45ac6b878f16718eeae
diff --git a/dev-python/pytest-expect/metadata.xml b/dev-python/pytest-expect/metadata.xml
index b6e0ef321536..97346aec5078 100644
--- a/dev-python/pytest-expect/metadata.xml
+++ b/dev-python/pytest-expect/metadata.xml
@@ -8,4 +8,8 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index ef30899cfd96..d594e0cfcf23 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 2b874f5e5e97..134c0aa4effb 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
-EBUILD pytest-httpbin-1.0.0.ebuild 847 BLAKE2B f4c72fadd27a9adf8621a26ad6093f8f66722534b739789d5f61843172d45dce4e38d9805c6509a1c0585ba309e65d9ce316ce512b8b52671d9ba880cf9f3ba9 SHA512 b7b56ecbb3e98c768071b728511dce1929f49aa69fed122ae640bea6e411824aa9bb5c8c175e60053d1210f41244b224527f9bceaaa194916a3cc6c69465f574
+EBUILD pytest-httpbin-1.0.0.ebuild 853 BLAKE2B e52110ded4e7929fb76bd263191df3ba24f11abb39d8bedd43fa628c0919894939701fe18e7ce88ad009ee99521001f905d9efe0f2dba48cfb8434ca72945fb9 SHA512 0259be7f5085c198bbc59cc20ca1931493635d52f99b181bc8da5a2a87c251b55b65c30a431b47778bec2e7f3b3cd41ef4a1d3696d401474e8d89f5a3d136287
 MISC metadata.xml 521 BLAKE2B f3135defad3eccac1a8f9a7188de8e375a970fd3b6c665395fad1d4ed570aa4a3a90728644fe45f13af527d5c51216e04631ddec670cb6ce5f026b508eb5f58f SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
index 15f1a1281457..b5c375726734 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 01567ddb0b36..1b56661ba0e9 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0-r1.ebuild 698 BLAKE2B 8c3042702366876a2a1b5d44b05ba9a815e6fa846a37fdabe41202d2ba2485f312578038dfb4836beb7e79856c0fa1b4f36017f038bca020c4c11b927f34dc77 SHA512 88f607f2d5842637d5b4d792f532d43cdce4aa8ee1dfcaac1d42cef5e22c66a5f16cbd1285f51b381490b9b9fd64713ddab0cdf6e81e95124390e9b33dfa133a
-EBUILD pytest-localserver-0.5.0.ebuild 702 BLAKE2B fa538a139fbdf71ac64fd8a43c18d91847a7920ccabef95b0bf95445967ede3ec7cccf3e93b208e5ee2d96f1bec0b52d547f9f7ed74fceb68ce8732e50d204c4 SHA512 d5c61a7116cf0a727f2db59d0a4a1a6e20242dea20e724bdf7c7f8b08c0f4eaf56d9701ca53cecd4a5add771dd89aa49cae9f509de4fbd233faed62d97110f41
+EBUILD pytest-localserver-0.5.0-r1.ebuild 716 BLAKE2B 0e6635efd6ebd7b961a5fb69a8cbceb79fd2f24b951a89a8afbe222b8b2f835be0ee4cdbf46c982c60af595f59457e516390a7f94a7fa28306ed1076a4be407a SHA512 d75d5c52f5693fc7f583a2757f78aa40470f0ced3cba0df2ae8714fc79c663eaa7a8b0e974bca3c116db874ed3a7594de4178d3c2c900cbca2a26f622a2f8ff3
+EBUILD pytest-localserver-0.5.0.ebuild 720 BLAKE2B 69567dda9a66186418036fcfe9bc35e45e53f4e92f41f5daa275ddcfcdd93161e11f381e13643270ff99f4ac4b4fd2290cc96fff6658d3887451ebc1bce3f936 SHA512 320fd0e1003ee031c9419d5a418a01307a2cbbd91175153c25c78a5af69c051a4c1f2d7295eac8784124acb70cbb27f4d46e78dc405db7901062b366193dbb21
 MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
index 8bf452f00dfa..bccd1638b901 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index 78b1e4c7523d..fd5d804e3e26 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.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 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 79b470e0ad7b..1f360a89127a 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -3,7 +3,9 @@ AUX pytest-mock-3.1.0-warnings.patch 1373 BLAKE2B 1bac1315bb8d95d1e6435aa15415dd
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
 DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
 DIST pytest-mock-3.1.0.tar.gz 25003 BLAKE2B 5f12bc664c6342912e0326bc4ac20c1e599f13c047964df3943ae5d31b8a3710406bc4d30bc2c2304c0fffefd0f49441644b667fdbf79426809c230e5b2ecc78 SHA512 6e970aeb1d4086df045a355e11969074e761fcdc3c8486e0405a4051cdf7c4425ae264e7005afe7afe5356f73061ad5f4cbad05b3ce2f55681a3e12ce1a6b671
+DIST pytest-mock-3.1.1.tar.gz 25038 BLAKE2B 416a84af52980d6984b4a2fd63a75fc79bf27fead86e7d0950f6dfcf38bfc27befbf86bdf8d6361b19a4e45c0bf6965d7a57bea5e3fff29a361e0cdb542ef0a1 SHA512 8e55bd7dc45de2c35fbbbbf4385ea805e6546c8d894f3b351bc31fe1c6d9c790f9e14f79de01262c18634d9dfd5142be7520181f1195faccba1f0e8a06ffe675
 EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea359f538af1f710daf205956cba1a6216f51656659ca17f6e2d52b64922be3c74499cfc85bc64cc937f1b3e7faead73 SHA512 77b1c578805b102cc04bb9f58273cbb238c128e2708968a3d9f27ca727a347cf3dbabf4d7e6bf7bf47f3356daa3345f62ae516f90c7f807b39e8c0a7089ba868
 EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
-EBUILD pytest-mock-3.1.0.ebuild 1027 BLAKE2B 29447f8a361255e3abfa31d90ba9a734456e2a0cd0a8258b6fff0f7fa9527464c12d82620c0b3d1897257c1b816cdeb179099da85eb67e669a1521732533f961 SHA512 b2dd3c92f5906180f68b3d0e19b694c0a3aea7d41dfcbc815bf08ae9a9b688a1b23c1875bdd830ed76f1e2b342650d52f94ebbc970212eff3f23f964fe5db1d9
+EBUILD pytest-mock-3.1.0.ebuild 1035 BLAKE2B 36b9ee8f1dfb890c9b0962b4d83dfe94308a63c496ab57cf9322bf355af234132367705d20984de0cfae29491577de1a028d31219b3a11c02150c7ef98d00869 SHA512 2167f6644d8c63017fcac086591d0b5cc2b9669cea6b09ee5229f84b28dea6bbf3be708915c22b577cde96adf58076162ceaf1ce8bfa5d4bcb485833ff9c2968
+EBUILD pytest-mock-3.1.1.ebuild 1039 BLAKE2B 8038537b64d82bace524df12da32054d46fb53cf19e3c6208bb321e131de68f5764c76d7eb628a5a465f940aec24c16ab01db24110f7b4d9c5ce92bb7224005e SHA512 dac5dd8572962236515ba15320dc6d113dc51fbb0ac2dbe6021f01daa43dea888dabc0fc7d1eb6ea210b74f8040c3f8060c627b4a7e64d29a72f7f65aba84f80
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
index 0c137d01ff10..816375eebd1c 100644
--- a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.1.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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
new file mode 100644
index 000000000000..145bc659f1e9
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/pytest-mock-3.1.0-warnings.patch
+)
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 42b5f1d41ddc..2e83ecdffc7a 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.0.1.tar.gz 20386 BLAKE2B 5ec94fdd0fbc5990216fcbae112973fa8b41902a6fa666dd4c5dee2422f76e128ce3a576ec93ecb86bddff5f6bca0e1afaf791583bd275b2543d0e780e45014b SHA512 445cd5346f0c19b68014eb3c27b06376ae6699e31d8c1fee0cb3cda6e927d0ecadbffe3b0b832dd38fe63bc1fe4e3108e2ecbcabf0641af0bdbff019681f0576
-EBUILD pytest-services-2.0.1.ebuild 1130 BLAKE2B 044c0f6cbee532743b53d20dd13f8d108c30638ef73e26341f460422198f411a236339163e2f67b78aa2ed3bbb4e00a2a063b865fb4403c2e9f07923f69d8bf4 SHA512 457e31106ff6811f5d2c84d2ad4eaa08bc38ab8517790b50b4c5bbbe348da09a74fe50701681876287ad2e5ed4d5c3365dd5088da0ab7821fc03bfa71e1c77de
+EBUILD pytest-services-2.0.1.ebuild 1231 BLAKE2B 3e19845e27d5a32ba284ee385dad4a0131ffcb550744483a3b18698e068da5a5dbc8506006d3e9824593f2069af2203aa54d0cdee2fa1807fa0853f3b6492b06 SHA512 337a4a26ad1216749aa9fe81e4ed2acfb96e0967cb301298f0301cd10f1e35bd4d0d4d45c84b6dd08cf0f750176ef6b693d06ec6ac92e42dafa9d111d77b00a0
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index e2110f702891..a2eec91512b4 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
@@ -12,18 +13,24 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pylibmc[${PYTHON_USEDEP}]
-	)"
+		x11-base/xorg-server[xvfb]
+		net-misc/memcached
+		!dev-python/pytest-salt
+	)
+"
 
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 201e24f5af9d..f1718bcdb149 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,6 +1,6 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
 EBUILD pytest-shutil-1.2.11.ebuild 1043 BLAKE2B 05d5587a94e5e9c251ac56bad0b4654a67ea5c4c6d308681802a781e22f49eba9c317667373e7a7d0a200033fb1ac7c46068ebc4446630d97a75322fcbc882d7 SHA512 7b8a537af1125689ff9ae74ef81a5c2719ebad8b91dd6892b4100b48fefb74e6ee6484707fcdfebefed6c677363846a98cb59f55b46acb74afc8d491ece5f638
-EBUILD pytest-shutil-1.7.0-r1.ebuild 1468 BLAKE2B ad51e70f7ea2ddd907764582fa74c643ff77e6c7c12bd869e5913c6a8eb18c304f2b54b0c797bb562fe611abf3d4fd637a65e5b0e374e9dd9f6e1d0e593e2e44 SHA512 e4c8ec393f8aa60d4d6575e0dd68fad5fe92642a837b5e7db4493d3f3e918f96e1ca9e4d62e25b27442c257389dc18c4d3455c0b776fd105f695a6fd2ae30d63
-EBUILD pytest-shutil-1.7.0.ebuild 1333 BLAKE2B 2decf98eed73274e6b0b130f6f9f31e2957675686435066db9bda231fc07ba2d0920161a0705fb7dd1a291bebd4fe4edaaad9e1ffdcb32daa737b9c8bb80079a SHA512 1c8f6f3ee4d9b45a6e8e402bba1e7e8b79d141a1740dcfb680ee9ee0912356b1bec5ec39fbc0a479c1d7895d5e10a83a8cdbe62668a0428c916460fc1b853cee
+EBUILD pytest-shutil-1.7.0-r1.ebuild 1473 BLAKE2B 2cf57d7ff7e038578fb8a82f4fcc6474b5456dc8fd3a70c8781b46befcdc1daa9d9715a97bd1e949b6a71d7c3b338a0ae32d71189ee674a1a8861c777cafaf41 SHA512 8caf7ca31564b1047cd66a0a2e7b1cc446657d8445595da41a6f4b3a9fe56b197eb4ef31199224309e4ecdfffadd0933047f5a717f706826fa24114e4b5f113d
+EBUILD pytest-shutil-1.7.0.ebuild 1331 BLAKE2B c10ec9a16b2a2e36fe3caef51240ae25817dcdad17b49b352c6d5f8e772d69676e31d095f31d56d98349a0e4a190de0a8f75f890a7729e188ad7dcee0dfb2213 SHA512 1d256181917ec67f49c71df1a1a099511dd31ed8e59413e58a4a357cd093f9abc238246a9c4e46e449b1cb03c80b7b3e7db56d7d5d6a112b88bc6117b040b789
 MISC metadata.xml 705 BLAKE2B 8e2b41e3cd3bca68e2c3ac155895005e53c8bcb7c3174214362cbb998922d76737de63345e86b39b50ff179b675aa44d47ace1267c5cfbcdbe06d54b632ed79f SHA512 4089110c45e9136e3fa9b7053f458d1c50252b7caab16bd2621570ef9736bdc0799899ac24f14510b526401ae5ecc5d7595eff8be5a7f643b3d28251114d0c87
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index 041dbc6f59fa..668d150c5535 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
index cfb7dacf3f05..d7793ef0daaa 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index de7d3c52dd3d..a4c7e6b53e57 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,6 +1,6 @@
 AUX pytest-timeout-1.3.3-tests.patch 1113 BLAKE2B 88e8158169bb254b4c36c6eb3a32a4f9c78b3e47ef080e2d28703ef0826267b3c925bd6de84b72f1e5b30b4109fcc99fd830704f2790e5505d5974eca90af676 SHA512 3543b0240d17a7e6e3aed29553e22a9638b285817110dd1fddbc26f667ab3c00864572ea4f9e4564c81e7dca60203b24e7ea2b317b6e328a48d518853e7ea26a
 DIST pytest-timeout-1.3.3.tar.gz 11627 BLAKE2B e20348cc461ad03e95c22a16e753b72441ee70da9769214f4d07db15818a8997339ced47244b15de62a61107eb749dff8d6f41ddb4720c925ef1e6eb9962db27 SHA512 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84
 DIST pytest-timeout-1.3.4.tar.gz 12255 BLAKE2B c8991e0255a490048f43e1163d0315cb8fabfaf9d96deb476e2d59da7efce8c63da09b1e8e6f9d6f3fe82b3c6f67608b5e5db117e6378a041ca6e5ba9c71fc05 SHA512 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80
-EBUILD pytest-timeout-1.3.3.ebuild 742 BLAKE2B 9f0797a83f98c1194eb940bd67008edcf7bcaf70f0d2a359981bbc8d807c3e17bb549d1af7083fc934eec896078546453d356c65d82a4746f89fa7b2f456609b SHA512 5f9b74f27f49a8bb159940d7f2c7c976ac160c9ff7cebd757f6cf95e77aa19740164273e3183435f4e1fce5a7a2fbfd4e47ad2c3b431b5f4d692aeef2a1abe41
+EBUILD pytest-timeout-1.3.3.ebuild 741 BLAKE2B e3408a045aa7dfcb9e3e752c413a257cb57c9f3e7f4d2b12ac120ce0fee057e0f481ed09b83bac86a005587a96e4140305af98b95048ac3292bb3c42c238d4fb SHA512 7d589a28ee3ed5b286ad0fd4d0e1eac46f1236631f69c868576f182f6281475243981c31a828d1190605bdee5a5c25143e31f42f8c4daee810ed1594b187c275
 EBUILD pytest-timeout-1.3.4.ebuild 760 BLAKE2B 1d66d2e4880ba14a840f920e0b36d4d2ebdbfe4a06b70eb4d57746c522674499704c1b201d0a8e8e49a1cc1090c19d155ccd1ffc887793e06926f23e07b28df9 SHA512 5b273c35f9bb2a9999c0b6a951d4ce31cc21a3a6218a89c4d6e7bfca0cbfa3603ac42e9910ddd3819f136ebb73b5492fb398dfee4be554335e3a23982085ee4d
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
index 2b362ace1e1f..2b7786b403a9 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index f16e3805b94d..61eec642e742 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,6 +1,6 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
 EBUILD pytest-virtualenv-1.2.11.ebuild 895 BLAKE2B 3a4bc62099267b8d5f9b89b615bc878c7f75e5dbb2be3ffc66d6c0530e483de5796c80e1c0b3abccfb77c7374f057b70ad89a927e4267a1e8a835f0aabab907f SHA512 386e6d536ee3621b2121eb11be99f4a293c2b709669e531d6a133d522e4eed71fc2353a283d74c21d39b622ab4458cbf1e9989c79fa97beb8260a4d4e5225d44
-EBUILD pytest-virtualenv-1.7.0-r1.ebuild 790 BLAKE2B 98e1c766064d94015630be0df4a49a9df33020a256663aab4cb3849247a947990a270fcd0450a239e04206c23882a82ab29563d51b1bdad8e944c5f7a7d799b6 SHA512 afc9f241d96891bc45616ef397515030a468d57cb30006a28e390f0f04fc00470db543d12c8b43cbf1e20fa657bcc748882bb380a1bc3c7fc8b8e6332ec1915c
-EBUILD pytest-virtualenv-1.7.0.ebuild 796 BLAKE2B f5249a680a77fe632e20ac17d830f8cc86738929996981af34a13c665a8e39c7fd901fd7ffb8299f5cc4e94c3c450c63a489b5c19d4007211d7ecdf81153c674 SHA512 1ca61616322a307044b9a867e93f249480ea34221eafb41c9945a5bbbdcec91f45f82601c7ea6b2e28159347772774d6e440af34b40a17436f905dc161e80c02
+EBUILD pytest-virtualenv-1.7.0-r1.ebuild 795 BLAKE2B 1a55c5a76e1e87ce4795120fa21cd3c8e3afba9447016a85c422335839d0035643f533a0f0c638e3206f36bd4308bcec2b46f7550c7b9d0eee85212a87d80711 SHA512 b0e9db474e85c90a519938d1552f81e92ae22d34058df48cdf2bdf46b7f8461f49757ff5d9cc9ce633358f617dfac3186e2b833a75816a948a80421566627b4d
+EBUILD pytest-virtualenv-1.7.0.ebuild 794 BLAKE2B 74c50de44d66acdb6bcefc862d15557c1ecea36e06fbc886e7d50a55257d3e628ada9abaa1af1f257b077591edcac0d86a04188dbdc704454ff59a98c2ab6a97 SHA512 b69468dd31cd69b1c23daedb6f73838819b29eeb36b7f19a1484f7023a814bf7129bcfac74368ea3fc6f7fe665e2d707386ffdbc385f45fa335b2f6587e9fafb
 MISC metadata.xml 679 BLAKE2B 1b48d29c49745469783c9bc7a8ce2e18648f94cc377eae50f2459e642a2c21373f7782ecc8cb3bcbf9bec448d2487f47528d45af6de18a741bc7d6cd0eb6b5aa SHA512 0d01c6c2a0b1644ff0755a5f8822075ef96055c54b721b651b3dfcbb3fdeff342469de1a5057c5b69eb281daed6d8763d8cce4dc7b8f5d1bcac449551dd92724
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index 777ccb8bc70f..238b2714e536 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
index 91d4ada65c45..2a2037b22018 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 1eb71fb25178..1b29b0ee406a 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
-EBUILD pytest-xprocess-0.13.1.ebuild 667 BLAKE2B 16f44ac9b53f74fe7ed7c88af268b10c3459bca74130fdc1cd49d0aad9ff13a248a89d18b45af467d01f71e98c95bd3727fdf514250a9aebf7fd8294052a6456 SHA512 9e00d89a1183e4a1bad327c4bae983998476c461f17edf13c2705ca1c22e764023953c719d39b822160be3f4f4b1709bc4a27863d623fc4aaa409e7116719c2d
+EBUILD pytest-xprocess-0.13.1.ebuild 666 BLAKE2B aa2ef6c031092babb15c62282c0658df3b71164d2c34322dc803f5f5146baa7ef5bf22f42d5f83fcb1a0ce82c43df8f86fc1ffaaf5b8d990ccd417dd409f8b22 SHA512 9ecf54be79b963f91717b52e962fc9c917c924d563d7772d73fc3cb9c16b398d6f30acd17a4efb945266b6aab2267b5ae4146f130624fd65f7e9b2be7a9d0a05
 MISC metadata.xml 424 BLAKE2B c4e4e4a90fc6e7dd7e474686b1a0215a380925523d3d41cba07cd5f59f0ce322a2e8fd10cd834ac263bcdef2d0f62bfcb48bf85373036bd8869f764ea06ef788 SHA512 822c6bb63a93d2ec81c4d7c00faa75ba7e97813f510d570385f075a1a0b641408d6323c9718ddd899fdf25b2d198204c5bba38604a593841a7cf89c44410134b
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
index 47bc0f21b371..69cd4344e0ac 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 64369951284a..b992ee775fab 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,13 +3,17 @@ AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19e
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
 DIST pytest-4.6.10.tar.gz 951516 BLAKE2B f87d00c3d69990f39369ec6af8c4b88d8b7da9bbdc9fcb324243ea2164a501e1b23d1c2a7f92049b58786fc2f1006673a5b5348e2367a8ca476650623c1f67ed SHA512 73668967f6568654cdf92e260ada79d9685fcfc30967499709caeb12527e39a9e886f057c4c73e8a39125c0fbfcd674d905b7023402ce0ab9e836aa77d3888cb
+DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
 DIST pytest-5.4.1.tar.gz 1017924 BLAKE2B 2892b06655384c8453963e8444e7c1659f4ce60410afe6d01c480da4858628f6c8fd8774131c5bfaca3b3baf9936e3e4d607788b390d37f7aee90cb39c4ba15c SHA512 50d94158817561316cfb4c6ad4481858a76cfe44ba964cc7a3bb81d3701eb621ca5cd46c4be24644134417d8bf7e7771f4b3a30af71fde5ea9705c3241fa2878
 DIST pytest-5.4.2.tar.gz 1020640 BLAKE2B e10ce7a2dbc1ff42ffbe02c3a9f72b4c829c5cc80ba9a50ae015d181c03916a807ee2b13d40e0d7590844f67f8b68e926c770d298fd839c3cf24d9daa4b4e1e7 SHA512 c92ffa613a02cee2580d690c24b76f16957082b138cf7c51d277b0fb5098fab2272ab73295e5e368cbd908026130a9185a35f8792054e36b7ade0a05f7f3f192
+DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
 EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
 EBUILD pytest-4.6.10.ebuild 2474 BLAKE2B 91ab3acadcc8833e7e9b5414d20e2a55ed054563a8d4642b60065d27e6521e9817ef7d487b96ad4a88cc1ba6c9b2a58b83257a43f731b710555fa857f3ad6a80 SHA512 653f26ab3dab287537285a382b7b35b1e2fcc3383a7b06ba362bf84aaf104083ae047d0563f858470f459c804052081c04c1eadfdbd2a9023ee19927ae79909f
+EBUILD pytest-4.6.11.ebuild 2484 BLAKE2B 5dd643088a64cef2db86b30b6b95cfcf8e9dcb5f01c0dc0eeda05a318c9992f80465a86dac10c6d95578b5312f40c1e2e2354692f2a8a4d6c1c4c37ee8bc4594 SHA512 0c22856acd593c4f1dbba474a3ce62abba9f3195f4fe961b326d4b5e8c7a6fb518d1bd26924d0eef76f96fb09944458217c223a47215952979d6a1f43a1b5b4a
 EBUILD pytest-4.6.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
 EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
-EBUILD pytest-5.4.2.ebuild 1935 BLAKE2B 8c63fbdc020eb76aa3164955d716ad78e20b90d840d224f15453ba7ce9f5d6de3b3ae8541969fc89f12ddef231b12b08bed1a82f27d5020f161c3f0a46151cb7 SHA512 59b5bc63121e3c2280a0684a06ea3a594adccfdd2e9532433838f1619dbedd000fb4498407c231110d2ae8365dd9706f2860ff3d4450b1c8eb9ea06fd65b7440
+EBUILD pytest-5.4.2.ebuild 1938 BLAKE2B 1cae7fb13190416aae69261e71f4c160d56cc92445a1145a2fe2d0c8c9895bd20ea616eadd66fb198faece158c0062d65feebd44ebf7d5971647228079f146a9 SHA512 a0ad4afcbec3cb06460e01db127575b3a20429619acf50e1e567e13a25c60348b70ba2c6bd2726a8c2b23b366b43d7b189e7dc6ff3a49dad8e1d5f5988e399f2
+EBUILD pytest-5.4.3.ebuild 1942 BLAKE2B c916fc49800604c6f732dd9ab8a3931da2c9f4a37e7095bec502fee038c8bb69c3486ceebeffa72f4824f0ae08c6aba7329367ced5e1615ccdfc30f61f45585b SHA512 93ca726ac64abb5dcea47f64b725c2d42b36c18eb0968224bc359ab725ce27f250ba7d69853cb09e36d2df149b191d03c1322e46722e9f666d9237647e776f50
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
new file mode 100644
index 000000000000..f7a45485dc91
--- /dev/null
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)
+	$(python_gen_cond_dep '
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-aiohttp
+		!!dev-python/pytest-asyncio
+		!!dev-python/pytest-django
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)"
+
+PATCHES=(
+	"${FILESDIR}/pytest-4.5.0-strip-setuptools_scm.patch"
+	"${FILESDIR}/pytest-4.6.10-timeout.patch"
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
index 7ea70529f1b1..db2b97ff63b1 100644
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ b/dev-python/pytest/pytest-5.4.2.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 ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-5.4.3.ebuild b/dev-python/pytest/pytest-5.4.3.ebuild
new file mode 100644
index 000000000000..3453fa72eca5
--- /dev/null
+++ b/dev-python/pytest/pytest-5.4.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
deleted file mode 100644
index fd3c2ed39c53..000000000000
--- a/dev-python/python-bibtex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-bibtex-1.2.7.tar.gz 60894 BLAKE2B dae5162e9d4b6893a4d411ffd1926f7f989940440609737b5c307af574d6e2794b850d6e4cb60bf33ba96eb36b3a0143fbc8fee907fc96c0c7d980514fe8db5d SHA512 6739824fcdad91e2abb333d9e17a31bd222e6100630b8e4f65a9e718d36eb451600fdc7380cb63b89c4a33a7554b79dd1c52448d19c3359f21deee2134242e6b
-EBUILD python-bibtex-1.2.7-r2.ebuild 661 BLAKE2B c0721b944bd9c618639e9600366cc67f629b911acae686aabb7bc193d53de658e70ffdf1d0bcac408ad14fed4815dd905e29f44f565084ca37976e5b96947bb2 SHA512 0bd9aa6cc0896bc0fdb27b4abeb086784473fd8e8e079711eb7c2e40f8d33fabef3b64453ba87f100716d2f0dc479dfd734eae88271339e421d13ee22f9ddfc3
-MISC metadata.xml 433 BLAKE2B 7d50fbbf95bffeecb213069d61af760c468d50ffcfe3c7dbbcf504cf496b944dc83671122400662fc4247bba54fef57eb085f86039c6e7600139b1e0b51398c8 SHA512 2f628ff97966f5175f2a5deab9a04f09c7350b2a74a99ad37930cbeee9881d8911d821af89c92eb832560e58cfcb7efd8af0c8f51ab3bac4ab1fbdd94e1639cc
diff --git a/dev-python/python-bibtex/metadata.xml b/dev-python/python-bibtex/metadata.xml
deleted file mode 100644
index 56e91f1d6c4c..000000000000
--- a/dev-python/python-bibtex/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pybliographer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild
deleted file mode 100644
index 5d64c7d1de12..000000000000
--- a/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python extension to parse BibTeX files"
-HOMEPAGE="https://pybliographer.org/"
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=app-text/recode-3.6-r1"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-python_prepare_all() {
-	# Disable tests during installation.
-	sed -e "/self.run_command ('check')/d" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py check
-}
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 9dafd9c9dee5..b75695e50ba2 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -2,4 +2,4 @@ DIST python-bugzilla-2.1.0.tar.gz 78791 BLAKE2B 31819e04ea5627b5513c22e9cb963cde
 DIST python-bugzilla-2.3.0.tar.gz 79002 BLAKE2B d3aaeaebf25bd56286fa1c4adcbf154ff2d84a28918bd1fd80e1f83b30bfe0f54f7418c75afc446c60046d69cf4ff6219718434158ce9cf040b0b2f7b94136ec SHA512 cd6e1c3f142ad74b8165fdd503ebaeb5e512ad8055dfc1e47e794908ac21cece6e39365544b94c123067f1d6527b65765431f2656336086e6dda940e446b763b
 EBUILD python-bugzilla-2.1.0.ebuild 616 BLAKE2B ef3d330c140e9734ac55057504d0ba6b8046b69d396927b7b333a489ef5952216877a556b04a887be37bc556fe1a1a85978c5b0616bbd6c116dd7fc472eacc49 SHA512 339318432730ae45f8e50a9487e2811aa47cadbbc44e856b9b4767969565fdef903d2bd8e9472fe75f792a9bc46ef3a65128fb3a8d6448127bba57fa9f51c5f7
 EBUILD python-bugzilla-2.3.0.ebuild 607 BLAKE2B c17c5b324a6f112fb19503a0cc47f09d78c332b2874a8ca965dbbbf42afca0f52d368abe6ab8f91497ca4b0d9aa7f07e78454d8f2b9c3a5be02ca6b5dd2a9002 SHA512 b740f012ffc724e20d3bd7d14f7b591c264406e2dc84a0271794faf0bc5dff1daf883df1918a57597dc7ce9a0718e170c203df7170be48975b67944d90ba531b
-MISC metadata.xml 554 BLAKE2B bdd76e4a8c02d0d5e1d21648ab3cdb96ad4b23404afc36c249fa2e738494a4a8f0d1c61f9d3d8afc535a141209617b1ed5a128cee8695404bc777f7fffe24542 SHA512 69caa0e1f52496adda88cfb9613748752deb313b355518008307b9d792a5e10eacdb51ffcf59c4b4d621c9a03ae9081300fe931bac948b5c11ecf0311fd7b288
+MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/metadata.xml b/dev-python/python-bugzilla/metadata.xml
index eea547b9ad67..bb0a65a76a74 100644
--- a/dev-python/python-bugzilla/metadata.xml
+++ b/dev-python/python-bugzilla/metadata.xml
@@ -9,6 +9,10 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="github">python-bugzilla/python-bugzilla</remote-id>
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index d924a0eed4de..87c95059bd67 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-designateclient-2.11.0.tar.gz 85761 BLAKE2B 7baaa417e0610fc59c2b5b3c86d69e5ddfd02fd23b94f19f0473bc55e545514a47923e48f6a831954f964f43a735668191de8e8a775e314eeb5e935718e47f31 SHA512 ba01da49100a7ddddb9394291babdbabbd1813db3fe3cb2ebd5e2be251795c7aaa8e5ea15e455ec4322a5a0481e6670bf59add49e91bf6799c748711c54e1975
 DIST python-designateclient-4.0.0.tar.gz 61298 BLAKE2B fc307cf07728e1adcd722b7162223ebeed4df34b81249b0ccab4e9c42d191ad1e320be486a9420d7fdbb9c4db02fd9ab2ab80c021472a101c83a1365b200f5f3 SHA512 b6a11c14219a65da059a4d55822d954b96d553c3dc30a0657a3cff1a309715c4d7f009e81ac54820a4d6f27451105833123fb89513cc7309cc09c124d7e15d26
 EBUILD python-designateclient-2.11.0.ebuild 1101 BLAKE2B 0900bb792c8791b953b60b9ca64ff9c8822e102fa38552baadd4e434889d7c251bcbcc4525908dd54faec5ac1b083c02c4dfbcb0c6654ae92844e96c9da6cdac SHA512 babeb6af4295e2e76c89802519e34abbe28ea43abacbd675db6d73fd6eea93b9c06614621d1b60717c469be7c17faa811774a04aaaa92d678520a19c51993e9d
-EBUILD python-designateclient-4.0.0.ebuild 1171 BLAKE2B 1a14c8f042f28b16584c29a1c4f55bf93a0c47fd09ab9e2ebb1076c77504e46bead138bf447caa2c108485d10cb47144ec1e403f5c9286e84cfec45f29ab0bdc SHA512 609580a86ecef6441944a73550f67109a045c8b4ccd7e3e4325fe88cb583b46da6c1e29f5367907c5c9d029ac7a462909f5d6c0aae90dd1d6dfe2e8e401e9339
+EBUILD python-designateclient-4.0.0.ebuild 1169 BLAKE2B aba56c300f631229560178e6bfdde94657c49fce8eb468694afcdb09b3b4b446fc8ca7fe0588231003c21899bb68e9b306146366234e7a432c64637bd4cbb72e SHA512 55c049a19e37cbea17e277a85ddfc5746dc8959bcc666a1aed459ac49b2d126b5a9c319c13a763396b7e18683566f3c907512de949cbf14587ee947ec5cb4b09
 MISC metadata.xml 620 BLAKE2B 5fa33f0a7ce50185042950605d92a30c786ecfbcf0cd6ce4b948623dbf9aa18192d832f9931715d898802f644b814b11940a44d8a18a9f659453ea1304f27ddb SHA512 b42ad7a3863003103bfb4660e9b2ecd02a4ea927337c0ddcb6c3cf0f04562f86f09174218baec94df52f082b0f2b4c8fcf94a130c4cb08ea6f7cb70972b4ba9e
diff --git a/dev-python/python-designateclient/python-designateclient-4.0.0.ebuild b/dev-python/python-designateclient/python-designateclient-4.0.0.ebuild
index 9e0c94e7bc13..5eaea5e66c75 100644
--- a/dev-python/python-designateclient/python-designateclient-4.0.0.ebuild
+++ b/dev-python/python-designateclient/python-designateclient-4.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-djvulibre/Manifest b/dev-python/python-djvulibre/Manifest
deleted file mode 100644
index 52e7b2431d3c..000000000000
--- a/dev-python/python-djvulibre/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-djvulibre-0.8.tar.gz 85436 BLAKE2B fa30c4e78ce41a0f8c3af1580806f82fe856ac7012cb26dd7380158f5a0fb8b78d9f6e0bacbaf146959db7334fca4afec9caa324d8c2d6af697b3e0a171ee1ee SHA512 c817fc518f398bf16664a5f5dc80e8bd086015c13f82c5265548e5ca5d90f293cb2132961ba8a73cb184bc7883bb5868d2d49ecd950d045d0729f876703e710c
-EBUILD python-djvulibre-0.8.ebuild 702 BLAKE2B 14baab9d456f5ab5c9ad0bdde9db0e654cf0f17defb49c811865073e0c95ad74994aff4e4470e49a2742b5cffe69b38b25caca672fc3c0eac345695d65cdaf99 SHA512 59888479e5bfbd3bb049f27bcd4f106f00ed4c4cb75a84ead249824eba521bc68a966bcb63399918a0a884f36601cd4ce5b5bc0732c2ef8483199d70e7a12af5
-MISC metadata.xml 246 BLAKE2B 9254d9230f40389806de235731356f89790a3a7c9bd8c3e78173cea5f21921ec2da32123b44d64e8630c1191d0accc2e922e3cc8b86d7edc4a7f42993d9b97ce SHA512 6099e01ca48241e19c169add69c7f98fcb503ab4726bc60779c5195c0f3b5f419112a7973eb477cdd3d6a60f34d99d821fa41f17b04f639de5e551e90f5164b6
diff --git a/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild b/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild
deleted file mode 100644
index 9ad0623b5d67..000000000000
--- a/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Set of Python bindings for the DjVuLibre library"
-HOMEPAGE="http://jwilk.net/software/python-djvulibre"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/djvu"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	ln -s "${S}/tests" "${BUILD_DIR}/tests" || die
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die
-}
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
new file mode 100644
index 000000000000..4ceb0d55637a
--- /dev/null
+++ b/dev-python/python-dotenv/Manifest
@@ -0,0 +1,3 @@
+DIST python-dotenv-0.13.0.tar.gz 28679 BLAKE2B 068c4cb499956a14bb4c310d2c9a63f4c33b6621efd11c231eeea2808951530fa6e7bd5356973c19f7ba6f3693434ca46bfadd065c7369f95014389badb2a00c SHA512 a7e725fd0fcb262f240a8f9eb6cf9b73560d799a10ec946cf901f960cbfa972396ead1aca833808a1675ebaec0b89720c32b2fe957ef9805faa942b0df1a9608
+EBUILD python-dotenv-0.13.0.ebuild 670 BLAKE2B 19b2e6f076d519c7c08af127a772852f1b42beaf311ce6ab5ea9ea3acfabb55966d7a1448941b9061e293379b5cb9e64f0a7168a34c03a47caffa5e7ea8b224a SHA512 4c57e4f396b267dd5146d56c0f14a4b88c358c23202f6b7e0c32048a9f349def2c81d8084d5072d733ee36f28d9e8b06307b2ec3311e48a402ad369a59a19b62
+MISC metadata.xml 365 BLAKE2B be359f891f6469f9d650dd2d0ec29e0641b3313f8dd5132462a3385d557a6cc72aab5fbf59f416c98239973630f8fa9c6e7d926b6cde078bb6535de322c033b5 SHA512 7eb826c13ed20a90b7317fad1a4647a8b52baad287c0286c3b1005c7d0ffbc148d376c8e7c4e2cb55a9af66aba6169f9a680e0f4eb8e8ad3fb7e55fce01b4b8f
diff --git a/dev-python/python-dotenv/metadata.xml b/dev-python/python-dotenv/metadata.xml
new file mode 100644
index 000000000000..7f33f1c07d79
--- /dev/null
+++ b/dev-python/python-dotenv/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>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Gentoo Python Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild
new file mode 100644
index 000000000000..19b23974b9e8
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"  # help fixing tests welcome, please get in touch
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index 2c42f2af64e6..04f4755343ad 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,3 +1,3 @@
 DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-EBUILD python-fastimport-0.9.8.ebuild 770 BLAKE2B ad1a92ab368a3f7b28fd88856db01fb922239e3b86dcd67ac89da76b357b359ba7f21422be917381a99bf7b2fe57be4162c3c32ae84e0413748be9ace53bac9d SHA512 588c30be30c2ac1e12ffbcb93dcaf8ef84e7c8ce872cb77f58df34d5b3edd1874a23a5701bd9c47e33d7bb866f471a854f9cbf0325007cd5c96545788f4caac2
+EBUILD python-fastimport-0.9.8.ebuild 777 BLAKE2B f983c1de7881eeb768a49a34e5448416d691f2b00750fefca795a718c5aaab7535a735bb56f116e00dd69d61c2ba0fcb7df0ef77d3615492f10ae0df13220af7 SHA512 6e576dda8705d5b5744bc4d39fdc443aa35575883748eb8882569274f85f03f8936e5e8e5909c7f084ab71464db23b69c7d523e0b33c62d3fafc1539d11639c0
 MISC metadata.xml 509 BLAKE2B 23407a89645a4f2fbc0954f2f02eb60c74e8aaf2c7385d3d8c098e64fbf949b66f262378de964c5fae6d84db4e6e04d4000438c8cbf4d44fc629d74e2f524b42 SHA512 2242fe2ba9731aee3face6de5e7fe146ecab037b24825a7fd5ed26bbfcf4136ab50791ccaaea4bcac5a23711fdbcac30e2181a39c8d0a3d33cd7acfe56ea2f56
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
index a28514e949aa..723334075aca 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 3c2dda3dca65..723942322a6a 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-ironicclient-2.7.2.tar.gz 246413 BLAKE2B 28c71f619baa539a2d82b8aa1e2462de092a385f0b6efd88fa3f5c676aab5603b1060e671b7fd93c2f69a83e6ce4c065fe0492483dd93cdf0af6633403775cab SHA512 6a41ccc0e811fae571652837244ed7f23ec9a7ccf512a71519315406abe7fe0117013765c4d6c1e3c75daa21346b1f94881a32217b3a5829bf473d0b18470c0e
 DIST python-ironicclient-4.1.0.tar.gz 201589 BLAKE2B 654e5f328676cdf44446cf12725821e65036e963be6be47c7bf390c87dde28df5a2d7673e52397797587d135dd89eaf0382ac724e5ff75ed07af1930d7754b44 SHA512 d2e8536ae91493e724c6f93acd8c85069a888eb11c9084519010e4a6ad96d7d507991c99301e9c9620240291d9f947b67455551d68aac3f126ea6a578e217658
 EBUILD python-ironicclient-2.7.2.ebuild 2408 BLAKE2B 8472d2f44aaeb56ae932eab35d1288e5be3af619a887031d034bb393c333a99b57d3afc2ba1cd451b6175ee2a76bffbc6c3c66b3fd9ed0de196afa859bc3b0b0 SHA512 06f4a6e6fce400df43375387d551d2729881f967ebd5988259e88ddf7dff4449edf009ba7bc9f544f9dcc2b174cf0f9d85585209331d303f14c66b1193afea41
-EBUILD python-ironicclient-4.1.0.ebuild 2460 BLAKE2B 159a6e92e22fff054274af09bf97cc10c491b88f6d055ab86360eed023ca1fd8eca093c7220552879bc23a307b99d637385fb0e7775b381b4c466b99a8fd5287 SHA512 019120c0a97d761047083e6f6da7188ccb817abea25f42fd248cdd1c3755d86f370b843cb780be677387b05eda629df3fadff748b2a2d0787a93a64cbfaac5d3
+EBUILD python-ironicclient-4.1.0.ebuild 2458 BLAKE2B 148111fd8fc0ad6781f2e595d05addf590aa7fcbf80ee0983a2304bd2369c3f1f759c419152280ebe114a52205df23c72319562854bde6c1e7fe0156e9e8bec1 SHA512 205faaf2021bc77e78fb2e6e2c886c74d35e34067a3beb12026cdf3c4b80aa5c3b9816ab54936d52edaebfa6c9ee4e2f5b70871b39702b675c828ad332d35fc2
 MISC metadata.xml 462 BLAKE2B cda46aaa523a8b818fb5e2dd53bc4db023da327cace7f21db32939249266f7cda27e09718d41701fdd03a2e9ab7c131c147d379525c8036ea2564b799fb90b4e SHA512 8e3b7de241be41bf1af0431ba75d275c5295f197b1c80174d52bc1f38c413300c9a267eedd7034f01200ddced7ddd0143942ebb4a496665ca1105551fb411453
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.1.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.1.0.ebuild
index e52537739461..b2a0d90916e1 100644
--- a/dev-python/python-ironicclient/python-ironicclient-4.1.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 1c31076a02c6..a240d6d40c55 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,5 +1,5 @@
 DIST python-jose-3.0.1.tar.gz 86726 BLAKE2B 82ad3cd1139b367d179e965aaf0e33f3592883da6b21ecb3a91e9fe98ff05dbe358e56156a3d34366ffc0d7bfa9efbcdef67c41307d803ac16144a0c0ac3570b SHA512 a39c3aa9acc6bcc0030e4435e499581043a820c54aa1a4b67ae478cf95f96f28755b03fa4453e484932a64865a61613a1ff4afe30249216e8f392638485693d7
 DIST python-jose-3.1.0.tar.gz 101693 BLAKE2B 1ee43ac5aef673f32c3d56e492784e28939b8f74a8232a83d31381b3f978d96ab132c94527df686b52f60c2865936ce022c2cd31ea66f009a83772d1389a7d4a SHA512 c4a04bed8fc17d65cb8fc9b2cf37996edb50fa0dcdc2dedd76a97c784f8af34a9c86748ea2f9ea348955ce780035fbe3a756abc8e1eb5e9b77ad57d411622c6b
 EBUILD python-jose-3.0.1.ebuild 1204 BLAKE2B dc1a25484f1a36581090967e8dadaffe471cbe37360043b0ffaf88be4f3d7013bc4d3e436595de859ea0d6e66dcc951d6de326acbe5efd412286f735e7713af0 SHA512 2f892d605794ad628653fe3f2a99e713eb8caf27b50a5360253085f2eec14d56093ddfa584ec5b162264c169b3ecd5075062f998e2fcbf6c912f755180675544
-EBUILD python-jose-3.1.0.ebuild 1073 BLAKE2B 57c7d41573f7eacd7d1e1b46a8938fb7aba44b2ea5366d906d6ad3594d467e28f8abc0fa5343a93d49b0efdfb57937142786ac91f3c16114c079862d14af2512 SHA512 5964c83d903cf5935ba39312ace5a5d0db8592d9917b79e3fc174e515ae23ec0d79541ccc5457efde0b30f5b6db72b3143c25c5d1fc3f39ab2edfa7384b9df78
-MISC metadata.xml 444 BLAKE2B f253d760dc81a5acb23c11eace88f17410135ebe2f336077e598b01f897e1a4304191feffdab06bdd5a04fb46430bbd090597a40e1ec96256865190a59a486fb SHA512 74ba057d1ffcb3d1995e1efe6436143260d8a973fe5cc9c1ffab0694932b2b3dd8eeccaf457a1d79fbb31f825b120fbc98fc3c0ad7b0796233e07df82357d160
+EBUILD python-jose-3.1.0.ebuild 1079 BLAKE2B a52062825ed82531ab6e9c4796ee353493f667dfed9089bcdfd137d6c5feed3c806c3a5b19ded642bbf93c1777953d8e05683721d8bd6db621c409789e322864 SHA512 61f341ad530731e41de7741d6aa88c805d06e422369a77c052965de76d98f0ff38f517d9c2ea618477adf8b60836cc42889d5c964bcbbfaf6a9d055156070fff
+MISC metadata.xml 545 BLAKE2B 239d505d9411dc5e1f129f6f7c922d9e2ceb541b1d1706f75aee921862af80c94372100145eea73b3d25649c97371f83d6278ef4ef9de65fc1049eaca1f4bf88 SHA512 8192d2511a4a14c938f5a6e877b83ddc850982a9f2e07212bad1da48e7eab9a698466caa8a31780f37bb82135eca7383eee62553f21b5b7304bbae8e2eaba1d5
diff --git a/dev-python/python-jose/metadata.xml b/dev-python/python-jose/metadata.xml
index 78d20636d80e..b5a80bcad542 100644
--- a/dev-python/python-jose/metadata.xml
+++ b/dev-python/python-jose/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mpdavis/python-jose</remote-id>
 		<remote-id type="pypi">python-jose</remote-id>
diff --git a/dev-python/python-jose/python-jose-3.1.0.ebuild b/dev-python/python-jose/python-jose-3.1.0.ebuild
index 87dfe24d778d..58a59dfc0efc 100644
--- a/dev-python/python-jose/python-jose-3.1.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.1.0.ebuild
@@ -2,21 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
 HOMEPAGE="https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/"
 # pypi tarball lacks unit tests
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
@@ -25,11 +23,13 @@ RDEPEND="
 	dev-python/rsa[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
 
 python_prepare_all() {
 	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
+	sed -e '/addopts/d' -i setup.cfg || die
+	sed -e 's:test_key_too_short:_&:' \
+		-i tests/algorithms/test_EC.py || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index 84c536ca56ef..82e714d7e70f 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,3 +1,3 @@
 DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
-EBUILD python-lzo-1.12-r1.ebuild 742 BLAKE2B 3481c38740136f1f0713dd304ca59ee052b7b9a92d2c67aaf2e0eeb9a4c5e8f259f2454c59ae10eced4791a58506d39fcdc05004141980fe46bc9a729944003f SHA512 a030edc91129a28c10c2e9ec6f982a7b621e71dab8d1e039b9b6c843e39c8c5611a4742b004748e21ed1044624c498611e29ead5c18c7bac07894147b85d0831
+EBUILD python-lzo-1.12-r1.ebuild 693 BLAKE2B 61918a94c5b1e1f632fa371655a81ba8413727434aab0e53ceae4bc4638b922753dabdd6b57ac041bb633036f581f4b6bdd17790ad58dd51e65276ad3d830f8a SHA512 e5d99a53ff84598027a765c74f01bf221f9cb33988acc5581cb40f0940c1a5e512abbca726b8340e64e29c61a8bb5e524ff58e2db1bd2694c69555efa5cfca88
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
index 4a7a1b29084b..8ff0146566c7 100644
--- a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 prefix
 
@@ -14,23 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="
-	dev-libs/lzo:2"
+RDEPEND="dev-libs/lzo:2"
+DEPEND="${RDEPEND}"
 
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
 
 src_prepare() {
-	distutils-r1_src_prepare
+	sed -i -e 's:test_version:_&:' tests/test.py || die
 	hprefixify setup.py
+	distutils-r1_src_prepare
 }
 
 python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
+	pytest -vv tests/test.py || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
new file mode 100644
index 000000000000..db1d694c1797
--- /dev/null
+++ b/dev-python/python-mimeparse/Manifest
@@ -0,0 +1,4 @@
+DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
+EBUILD python-mimeparse-1.6.0-r1.ebuild 592 BLAKE2B 974c0c76c435c5d8236eaa9e1dcc97e9cf6a95180ba8bc558e6ec545fad48b01b95c61944a1464e072160b5b597ada007d2c68535ffaf7cb116ee32405b9b8d2 SHA512 f8cf6d105543eb9ca27c0425ea666f8481a9e05643a46149c1717a55f9c2dbb89f1967707643745619386690d7eec1282e0560da9b0baf43e5841f176e2b9083
+EBUILD python-mimeparse-1.6.0.ebuild 984 BLAKE2B 2c276ae0a8dadca8ae5900cc16c96bd5b1407cd07abf77d6d658648bbe24fb513081d4e422acbd1514670db66fa49f9c00b3883b57638cd82f8bb7a4eacb9414 SHA512 04f103fd15a7fdd62da234f920d074f49863c2625f850f13c6d7270a085ab1bfeeda5ea1d3b46d1db640a16e2f0f5d6e470bd9fce03865a9778c7438e55f7bb6
+MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimeparse/metadata.xml b/dev-python/python-mimeparse/metadata.xml
index e9e258b9c887..e9e258b9c887 100644
--- a/dev-python/mimeparse/metadata.xml
+++ b/dev-python/python-mimeparse/metadata.xml
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..2f3f88f83972
--- /dev/null
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Basic functions for handling mime-types in python"
+HOMEPAGE="https://github.com/dbtsai/python-mimeparse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+python_test() {
+	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0.ebuild
index a2e7a6cefb70..d4063a6602cf 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0.ebuild
@@ -3,29 +3,21 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Basic functions for handling mime-types in python"
 HOMEPAGE="https://github.com/dbtsai/python-mimeparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 python_test() {
-	"${EPYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 7ebe17282058..b5d099fc2648 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,3 +1,3 @@
 DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a63de495ba630eedbda96d1b080cfb1cc635801794a91103bbd4b9145733d63ce3ad252748d01ed596cd3b0f7895 SHA512 5fab12d082be39ac4a3477ea10b5d1fa350ceac23c97fb12a46f6cd0cfa6a83999f31528d6d7f74c1ffe67f4e63dfbe8fd3debcf917a6e3705bcf84a55a458ce
-EBUILD python-mpd-1.0.0.ebuild 1005 BLAKE2B 4da59d14668451d3ed9f74b47c5cd593346dfffdc77d30f20976ea1f03303316e5881880659dda6a6abd9c13dc1d90c2c66cd3a358f305f0adef8da14452c526 SHA512 661674eed79b3ba2421ea5627e318f1626c5cf34235429d020bbc3be21f0c25a6d1a2c9650e7d7e9b193761e6eca39c7545bbdc6bab8cfba0ae61ee3866afae0
+EBUILD python-mpd-1.0.0.ebuild 1007 BLAKE2B 8023ff6ff33e09d6186c4e40330996a943811181c5a5771b696610474763567e84a072adae261409b6e8be71505d492bca9a9df21893d7e58e0cddfee0e0cd6b SHA512 8f850493ae4ca365f4e6a276c85b95db9644b9005a9c86affe6386191c30a2d559078063d45474639e2b812297510fd05edb11ed35c8fe7ae05763cc3a77d272
 MISC metadata.xml 438 BLAKE2B 5429aa3c88046640fb1349404a60f1508f5d86f698ef410210507df39fd5b2d2502d8d2dafde32c8a6f02c2d01e92cca1dc37255435066dfb3a41d26850a367b SHA512 1101d7830907a54a4ccfa1a1db8e6abea802fddd3ee0827770d9e15157be6a3e9b491eebd4b80eab38074fba743fc0671686806c27accd060bf3948736a86c44
diff --git a/dev-python/python-mpd/python-mpd-1.0.0.ebuild b/dev-python/python-mpd/python-mpd-1.0.0.ebuild
index edacb331407c..bca3a1df982b 100644
--- a/dev-python/python-mpd/python-mpd-1.0.0.ebuild
+++ b/dev-python/python-mpd/python-mpd-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python MPD client library"
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 18cb24fa0170..22d895091834 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-neutronclient-6.12.1.tar.gz 290511 BLAKE2B 046de903c30539183c5650e3f666ba1f24c311d0a9848cbc7c79d64f0d35a0c380917453bf7c8251a1099fc13a15da2ecd5facacde26ec46d859510ba4203dff SHA512 cae17fbffb4f0e78aeff07e90a1d08e5f2aaa3221192be8bf66ad8ed108ee01b0307f7a9a862c685061c77ceb831a7eac4c8343a8b5a71d1380277cdddd90b07
 DIST python-neutronclient-7.1.1.tar.gz 292316 BLAKE2B 701e6749eef13973040da3aeb59fcda98a3c0ff73cf99527de61b3a4e9a7721e828361a25e82ff3de87990348e31539628d91870eb02f8971ee1135e47d73e69 SHA512 a9fbd62665abd3a4009c6d934ed51c69a029ca3d4a3d37d073e0c2facf4b50e1a651a389c266b62ee27cfa81f7b973fe6a3d27577f8ec83bc1e8357278380c7b
 EBUILD python-neutronclient-6.12.1.ebuild 3080 BLAKE2B cdf730cf18c27953d8e12bf491b5c852b6d8b39ae1d0456e987964f64966bb9044f8fd1229070809041587341d805f744a9f0405de4bce467b2b0105a2776674 SHA512 5ccc371f54a932706b5218a9fa3b8e9872f36c5567cf553827d7217f3f52d7ac0ab502987951be7ab9c2bf2406a14905e7843e2261e6c389741aa16b7b60a52f
-EBUILD python-neutronclient-7.1.1.ebuild 2930 BLAKE2B fcf13ccf236ae5ecdea719b0360456ad0032a686d53e6aceb2681d0b493bf17264fa48fc7b37e2dc3534b67d725e458424441a5b951ad8b4bbadcfd26ef1012f SHA512 e362eac954130042dee54ffc07f926418fc7d1964b2a8392f816f187ed51c7d7cd6defe973bee30132d36fcb70753c160dfc9274fcd28fe943ea12eefe9932d4
+EBUILD python-neutronclient-7.1.1.ebuild 2928 BLAKE2B 13a83fcf6303cefcc1ae8786f04c5d97ed8ec7a80e401595b54d73d7bcd5c2767321de71241b9727e6372b601a0387a9a06c526aea463de47ee239c3559f6107 SHA512 426e7883a15798441a51ee81809a0e324364ce4b76cf5458f8d0b519acf1a14eba5dc7092ac86ecfc68213b76d998d82bd809d958f490d2aeb39430ba1f3757c
 MISC metadata.xml 512 BLAKE2B f859c2c740281906990606702ce31d2626f6cd767fc2ade3f5ff2a9c0756ef9260953282946645afdb45c3456565dddf2e0aba05a0bf67ff90605099719bd8e3 SHA512 fc2cb912ca75c5fbae4bda77177f58d6106b1995d8b17e368ee75a0c27ef0f3d14462010bdd7d5c43e71e2b446659b34e1e3cd94c274bbe53ddd979fd872606a
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.1.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.1.1.ebuild
index 461c18e5cc0a..56521eb18f95 100644
--- a/dev-python/python-neutronclient/python-neutronclient-7.1.1.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-7.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index 282d01051a4f..2210789776db 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,3 +1,3 @@
 DIST python-sshpubkeys-3.1.0.tar.gz 55289 BLAKE2B bf1836c173b542f0edc8dc0635a1f5bf109ef95936ffbabf6bbb79ac3bc34c10a769733d622c338b1f3a87d5be84b89ea9779f7fa293cad706f364d5e8867afc SHA512 4f07cb7bd2b1839a63bff842660499cee816e8675d8fde1e84ee567e354c82677a69e539b99505c6d1c5e0e7a5962a36175eb0cfcc763886a33952d2346c3405
-EBUILD python-sshpubkeys-3.1.0.ebuild 730 BLAKE2B aaa3e6a6fdfdf57b3341bffcc3563bb413e402f365ea060946765e132a2e598bcd0a4312d4cf3c19099371c4354da2ca544ea099b85e235bcf70b1bc2b3edc2e SHA512 bd3c2ac8fe72ecc52ebee125ed19a7d7af76ec53e75aea3256486f0f111d883a2adae524a624bc88eccb67960ca08c6ca44b9f1c0ed01295190c03e7eb1d703a
-MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
+EBUILD python-sshpubkeys-3.1.0.ebuild 556 BLAKE2B 27c5a3f70c99bb8036a960409c4dafd18bbb34ee43126d9d5353fedee0f3c006c7ebc08968ea12d3ed88d2534566db77eac6b399eb387f0d4b59ad6ffe755f35 SHA512 93e17d37091342b4b96b0d6c2a45e1102e41dc847feba7d61adc0c707b5aea72bb431bc2fbff9580d8e6d0db2b7125f3c0f4059feeb8bf6c841c9713f1af6334
+MISC metadata.xml 362 BLAKE2B 789c599311180046c3d8d7332e1c11989cde2dedc8abf68d6c72ef5924a8e9a15847426fc71a5c57905c022910e2db735879de2cf20c4b8f770a4ee51118a031 SHA512 78963cc8668296c4b984155d1cd7169a89da8b4950a1c3c95f2d1782c197d40e68e0e5e9c6b3b59b72bfad056986be367dcbfbcba489c915eb79a4f5770b56e0
diff --git a/dev-python/python-sshpubkeys/metadata.xml b/dev-python/python-sshpubkeys/metadata.xml
index 56cae167d372..c27580a1ca79 100644
--- a/dev-python/python-sshpubkeys/metadata.xml
+++ b/dev-python/python-sshpubkeys/metadata.xml
@@ -5,4 +5,8 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
index 21e44f995cd5..8d2ecb683814 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="OpenSSH public key parser for Python"
@@ -12,20 +12,11 @@ SRC_URI="https://github.com/ojarva/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/twine[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 1f8ee365ac8f..20f1c64951d9 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,5 +1,5 @@
 DIST python-stdnum-1.12.tar.gz 882778 BLAKE2B 49b0b83b8a76cf8963b35729b8acb1bb7f6cc8071cfee5490ba8f60fb2b74df28e11e65d9dafe6c717d297382628fe924ab5e193d8a39597cc214b98f12fa5dd SHA512 7eefc997494f538cddda8a6ca60d60c52e35f53023edd69b540c3f1aded00d795741ef429f84be6637e737e031b0ca771d4c1a060c94c90d7aa4144cdb0a536f
 DIST python-stdnum-1.13.tar.gz 893897 BLAKE2B e901a0b56d8ca4bcc25eade617af80bffce8f4b49a94dadefa7cf252edf567d01267256d3eaee77f01e41a99c0ffb26c80de1092f6437efdea2f115a9e997c80 SHA512 91bc476c0fec49627b772c43f031bcdfea044385256817d76a2fcff3aa76f26e85d308aab5262a682d54f67a1851907074b21d260e687f81c733326c40a0e0cf
 EBUILD python-stdnum-1.12.ebuild 629 BLAKE2B df37770bb3e45b1d3cd6512c0cc3ca4b9cd91ad3a16d01c4c4d0534bdb97214a62509aa2964bcec5aecab81819bbe5063e91a99dfddae716a84d77fb464443e4 SHA512 7ae58dffa8c80a4627738cf51e1990dfaccf96633faf314d4a63de8175bdd780213d474f62ab067040ad585958f6d5ef4b35e81d494bde572886c4aa5c142616
-EBUILD python-stdnum-1.13.ebuild 632 BLAKE2B f3a52a235d4ad72ea6cb46940f26cbba376ef4c3eee410e36c8959dc0677aa81f1c6ad3ac39b14894f2d8b24a30b0e7761922395960d05b153942f5785b8b7b2 SHA512 c092863bd231d2a030a3c1870accbc91b4d961b86767712ade339112cba5586ffb455a82cfa93e26d1cfaf7d4c5d1e9b7d746ec1bd727b25fb357e4ff82a3fa8
+EBUILD python-stdnum-1.13.ebuild 630 BLAKE2B f22b60593fd1345f9656648c2deb85367fcb557c19f70b3d44c0b4876b49b876f3661bb248f1132ee32bda1083c6c60cf77b6ae91b8077cfc2c3ffe94a13448b SHA512 fe989b0074421cebfaf65a10ba2effb5868f10a89a255ff93aeca32f42fc4040b00e34b44ac0c367df9c32979139919e57a7d6f7b5b951fab2c8903b0590da38
 MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
diff --git a/dev-python/python-stdnum/python-stdnum-1.13.ebuild b/dev-python/python-stdnum/python-stdnum-1.13.ebuild
index b5adb936c630..0d8700d77754 100644
--- a/dev-python/python-stdnum/python-stdnum-1.13.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="vies test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-vitrageclient/Manifest b/dev-python/python-vitrageclient/Manifest
index 7fad60fd983c..aa9ebe952cac 100644
--- a/dev-python/python-vitrageclient/Manifest
+++ b/dev-python/python-vitrageclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-vitrageclient-4.0.1.tar.gz 47671 BLAKE2B 6e1e72d0de1cddf9f72d1ff6bdb2261f4f2295a1fdd6ebe0e9ff497b48ea545ea999d7ac7bc79adabbbdebbb3b1b36e853d083d3b6c6e9875fe44bc36f76acf4 SHA512 607d669a4ccddc0eb938c26cc4f2b2cdaac8976a7c2b774b8ce49df6bd2e5fbe4ecf210eef008d49e3d1689a686bc6e0820c3b0a11f353a2711b9b2cc743c9e1
-EBUILD python-vitrageclient-4.0.1.ebuild 937 BLAKE2B 440d19a32282d20b4c671c98b23f8a8fa128ad6b3053730eb7a6cd8862e0eb7a574efc33c7a5a9720bc368f1d259a935f4570eaf0c8d969209dc6f11664f5734 SHA512 f7ddb75b9c99fd441f7a8a0de7c7d7b9ac1b378b648b13bf0ee05319230d83a50241fe7e96d1e2032c7d15d082dd724abfc21e3fa96087f388aa8e4481d0f1d4
+EBUILD python-vitrageclient-4.0.1.ebuild 935 BLAKE2B e5173f4cd79e3668783b24d5970835afe99f8bfc806fe5d9c5045bb43e7db4ec6bbf6acaae07c37ce1d8cacf299901267c8a45e82a2345e54da5126806d54a78 SHA512 1bea3e1fdb6119de3ce92830a910ccdf6626f77e63229cc2d3b93e656fca9b4ab1500c8a75d922fa8d1ec5d7f3e403adfec13b23206d6fe0f0781ae64b251862
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild b/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
index 41077e01d3df..5f9dbca9e483 100644
--- a/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
+++ b/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-zaqarclient/Manifest b/dev-python/python-zaqarclient/Manifest
index 556411b622cd..2e616bcfc202 100644
--- a/dev-python/python-zaqarclient/Manifest
+++ b/dev-python/python-zaqarclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-zaqarclient-1.11.0.tar.gz 85724 BLAKE2B 84e34998a76bd475b3aad2882f076f8ca89dcfc1a24155d0e88269fda3d82d4b1348461d1f59a5f21726dbc56b37219d9e75957737452e759672505a1f16a4c9 SHA512 4b57cd336a6517760d32a5e01a7c87a9ee0526323a222faa6fcd6e33a506b0746d6418e9eee3fa00e7ba4a01912ee108fe1feb3469e0a14089cc760a0756b7fb
 DIST python-zaqarclient-1.13.1.tar.gz 88428 BLAKE2B 71870c7232d4f00b626421fc41e033925fe58f0699538d3e7f3deba2ac07e692d8e676eb763429efcc16ca0c39f8a15317106ca8f6ade583555a89495eba324c SHA512 4854e0a90e98d8172058316fbfcefc0a327a81ae870db28a51264b8e4b809383b652818506f734dd2b35648a544d0811046957c97a86f12d696021d54fbfa890
 EBUILD python-zaqarclient-1.11.0.ebuild 1197 BLAKE2B 950d06f78eb5510df2958478b706fa5c7e45b8c0ae13ebba441ba713f12390c2a3ab5730a0b3b40399ee518d495630c49e59fca40d14f38434b202168d9dbc7d SHA512 24089a1cb53adf8feb4c0d81a0457bf468576d72fb51519aba6e69d450e28684ab8274e1a780a7d3c18ff773126afcca41946a6124e3ff8b859d26bddf57ea67
-EBUILD python-zaqarclient-1.13.1.ebuild 1151 BLAKE2B 58ef1068f3d45ed0706d95898689508b60b23497a0133f2415ac7c6b3c2c31c7ca5e29e9c06f0510e3b6fbfab79564cce4db47692e608a8c99ae57b5e89bd74c SHA512 64c9b501a6e1f20ab57fed669ef476131b70b157fb87fc8f70a6dba0f08ee034e696d360741be350e6ea3b797e8034efc39fc5499dd4e80e84b34220d7efa1a1
+EBUILD python-zaqarclient-1.13.1.ebuild 1149 BLAKE2B 320088647351896feb6c7c0a71550e9dab6a3bda6457644a1f4292319105c38c62f1a7172162562b2f34c4c0ee3ba9450990efc0d701dbc3ac3b18b9ded399e2 SHA512 9524ba8f8fc7a44079116c2656fba6a767891c6ee0d9f19d39868281de688a3dfa8edc11de2a0ff1f657cee0b9e56c171d902ed67092018f78a79c34fb4745b6
 MISC metadata.xml 607 BLAKE2B 28721f37ce75146475891a79e765fc5ebc12f2e4067b259328fd63fc6aabb16d328d720c2e31cfe538841a638f15e63f141b35a930495e132470cdc0a3777a63 SHA512 73cd47155606b208b2ba83664732ec7fda229f075a86837bae68344bb3fbc10756a049a1f83815f65346d93fbee7a30b629c6769646da2385afab6237173038e
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild
index afb54cdfbf28..17284e855fca 100644
--- a/dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild
+++ b/dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index fa3946e26f49..68fea9646d77 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-zunclient-3.3.0.tar.gz 112986 BLAKE2B 4e605144b19e938c3d4fe556d647c6e6e112ab3419961318a3f711ac0e29d87f3fea5d5a1f16c836e669ee1dfab78f3d8039e0e829038e213d06a657743066c8 SHA512 1d3be57a673359efbabde71e34a3e5e7b0778d60d8f469273f087ad5927040258bf4dca264ced64d6a4236f05cde51fdca0f644a0dad4ba3af5d333dbaccd5fc
 DIST python-zunclient-4.0.1.tar.gz 114913 BLAKE2B b0bf2722f67158a79b4e4673d237696564668a96e01107d33cfe13dd51ff0efd9916930277a7146bc1600cf350b41839817d496462f48162d569bfe3a7fbd26b SHA512 bdbef196053241582d0b641a6c4c25c0c167a21693e2796a2d92c6d93c6b627d19fbe14286fe469bd7067c79b2bcb298009cda763398dd2f31e9df891efa09c4
 EBUILD python-zunclient-3.3.0.ebuild 1091 BLAKE2B 7a2b16f262b35d3fd18555681a14a5c7b86f03f5a09b1cc31dfaa1173f44476d77efc2d58bc15aced718993a1b168d1ff3909ee283c176b3eb3d8b5c56a518a2 SHA512 a31eabc7ddbc8b7f6d92bbd3c78734277db59f20301cc6d8d512bc953d6db772e4c44ff0b628ec1f304c2a3ddc0b793660efb2fb7dfcf53c43198366b232476e
-EBUILD python-zunclient-4.0.1.ebuild 1089 BLAKE2B 7b9aadeee5ec4b3891708e0596092fede3e566e4691a9d5edc68ac6a28e552a3e71f9c0ce8669f87dbced5731f0fcfeb7d092046f64d703edc5261496c2df7e2 SHA512 0cd31d7441fd7d121216116748587e97baad123be56028f903ae43bb4f53b17c02166670a0ff6fe5d05d60922fb2c361b61649f4130838e70b3cc32d4ee043db
+EBUILD python-zunclient-4.0.1.ebuild 1087 BLAKE2B 1ce2d1115c1d7d57a16d349902e3b3fb46a6e2ac358223e3109421623ad506dc6011d0b259b55ccb009ba14911ccab95da1ef7cd587c341b53d3d302aaebbc27 SHA512 1479bdb9009989849316732e9b700db070b8c8d099edc1d3c14ab2bd13bfdd0990afb94e8532adb083ba94f3923abe2647c7834b26584adaf5e6782af130c099
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-4.0.1.ebuild b/dev-python/python-zunclient/python-zunclient-4.0.1.ebuild
index b836e3a794d5..9eda2b85ec61 100644
--- a/dev-python/python-zunclient/python-zunclient-4.0.1.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index b7b766264e8c..8e4afe512c3b 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,4 @@
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1349 BLAKE2B f33d35db2be5aedba22adb0341a6e02c46b4f55e7753647723e289dac0599cb9ff0490abd92a0e990b57bda442cf78e0f1e844856bd532c955c57da8b11df220 SHA512 e8cf13f597b1624b8898f40846fda7c75ffc30a14f28bd168495c73ac1b0bcd420be04b80631696612d66e5234552dadbd69bdb44003d103bdc52e3c5ddc2867
-EBUILD python_orocos_kdl-9999.ebuild 1349 BLAKE2B f33d35db2be5aedba22adb0341a6e02c46b4f55e7753647723e289dac0599cb9ff0490abd92a0e990b57bda442cf78e0f1e844856bd532c955c57da8b11df220 SHA512 e8cf13f597b1624b8898f40846fda7c75ffc30a14f28bd168495c73ac1b0bcd420be04b80631696612d66e5234552dadbd69bdb44003d103bdc52e3c5ddc2867
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a
+EBUILD python_orocos_kdl-9999.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index 7b2f41eea0d4..06e204006f9f 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 7b2f41eea0d4..06e204006f9f 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index e6bbf9a0685b..5b22c74cf8c7 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,5 +1,5 @@
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
-DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
+DIST python3-pythondialog-3.5.1.tar.bz2 1418034 BLAKE2B 28dbb76a213d702abd6fb4571ddd28acea0bd9757424e99432aa58c1336fce2aa9b248e4de0631fe34c7ac52b928c8b3dc65afc42a826cc268ca4247be4dafb8 SHA512 f032e425ce1ebac53ade1401e48625b5869497367f788831d08fd22eb3b3b14fa5aebd26fd3681b47222ef0247ebb5c1ead127f111ca296197e258650dd675ad
 EBUILD pythondialog-3.3.0.ebuild 932 BLAKE2B 4eb1fcaa43010d888a376392c9154048092f8876ece3b505fdee604ea44a992e38228c676528cf238050ffb770e84cc7a999c9f763770c9141dc86948681de62 SHA512 c587d7b4b3a7a4684524c9b0e2e9f2bf6e56caa2b4caa82c1b9b259cc0888ec33c6510a4eee7d4a2455a8d7b5876cdbe545564b6bfe89136bf4fd7980a400fcd
-EBUILD pythondialog-3.4.0.ebuild 937 BLAKE2B d14852f70eef826c406606d0189cc1244c3a8505619110b6594abcaac241552b5cca666cc26cf261144d71fae731c257b0098cc38ace9a66090b65ec29790b23 SHA512 ddb65c8c90ad30119a903a849878cfe5fe4bef49b065198b4386ec258c8f5e4ffcd5981999665ce363f20ca60541634db2ef18e259bd24db9d0bfc7812204f36
-MISC metadata.xml 305 BLAKE2B 60c1128e5f2cb67a8a6241fed1d136b6ec618ce9841f87bdbecd72e5d2200f324be7b4c4ce75fe60ae9baae3fe26240645967865ca7d79fd2ecd47f24667cb7a SHA512 b3bb016c6f24e8e0b48af85510c0cfdb74e92d382f81e9eb3c2e510e544f71568b0cc0dcea5aec70a32d829e6ab4a348c9e3039e52895a959ff9c783b1eeca47
+EBUILD pythondialog-3.5.1.ebuild 737 BLAKE2B ea89c8a815adfd828a17ca0221cb4004a16e92c4a990d0ff953bef3f6bb672eaf5ee45cbae4946982e1f4acf51ecf4508d30837deed61c203296ce0c070e1f55 SHA512 597f2cb30d00e46782821aef4feec482f9b0c5795f1ac11e51595b6a6c1f0caedff4ea5c4d88fac72c50ececc856aedac1eaa067408f3ceb4d525110adeb761e
+MISC metadata.xml 476 BLAKE2B 7b503ba47b66c7d0429557590fd070e977e0ffa1bd9b5a25f29d396996ef7efeb0343cd6ffb5324b52c22f7fdf607824ef1f15dbb90cde51fed66160cfa5c7e4 SHA512 0797cb8228d91a59931a9b36151bed33e8a01dba279b503d5d76e70b2674a2ec7dc0ab04f1aacc4f5c4571ea397efff8c087e701e0e6304608c1193de0c1102f
diff --git a/dev-python/pythondialog/metadata.xml b/dev-python/pythondialog/metadata.xml
index e657e44db07c..d39132dbf3ae 100644
--- a/dev-python/pythondialog/metadata.xml
+++ b/dev-python/pythondialog/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>ilmostro7@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pythondialog</remote-id>
 		<remote-id type="pypi">python2-pythondialog</remote-id>
diff --git a/dev-python/pythondialog/pythondialog-3.4.0.ebuild b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
index 6463cb0c30b8..460c64b9f263 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
@@ -1,39 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
 HOMEPAGE="http://pythondialog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/pythondialog/${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx doc
 
 python_prepare_all() {
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
 	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
 }
 
 python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+	default
 }
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
deleted file mode 100644
index eb7be8982462..000000000000
--- a/dev-python/pythonmagick/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PythonMagick-0.9.17.tar.xz 271844 BLAKE2B 92ab2d877332e23c3e869b9e92290e48b2b3d3df107186b0f1b718b2d6b3421b9a27a95f6105856cbc75bfe4ddc3b6abf50b4d2a50a3c81c860e389b797f91ec SHA512 e50e5e0d27f2dc8ccd1b251a0311ecca825423b34e85a257bfce42696c4a285977ffb8bade487fb8a3a4f8cad26d0a41fc067b172b733d0c48e951a27badded7
-EBUILD pythonmagick-0.9.17.ebuild 1154 BLAKE2B 59e93c7835ab5ecbc14ae4793fa1663389bd73cfd26911e7282a6ee03922e2fc84bad6ffaa6bf25464688debfefb1840530b09f4c553964abadd7519283f1423 SHA512 e07d3d2159aa6115e02f85e45bfdae066619a22cc295dc067c87aa1a65f010e955514faee433a03cd625bcf27d2347264bb15c0586b7b0c18125f944560cdf0d
-MISC metadata.xml 349 BLAKE2B 3701c88035855f490be6b943b8c778884f20f42803b4539ea8442baf90862c9bfdbc58ac99e3312d811b9defbd4264e39c4da195896d575fd5bef11da204c4ac SHA512 14d5899e6fcd0ade11aec2f92cfce123a9c1093877e340e49baddfbbde0ca2b3052dc77181e4487c19bb3e4ef7391bc0171b5e26b004517f6f26254c73393a58
diff --git a/dev-python/pythonmagick/metadata.xml b/dev-python/pythonmagick/metadata.xml
deleted file mode 100644
index 8dfa66390445..000000000000
--- a/dev-python/pythonmagick/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-  <longdescription lang="en">
-  An object-oriented Python interface to ImageMagick.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
deleted file mode 100644
index 8df6dff77690..000000000000
--- a/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit libtool python-r1
-
-MY_PN="PythonMagick"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for ImageMagick"
-HOMEPAGE="http://www.imagemagick.org/script/api.php"
-SRC_URI="mirror://imagemagick/python/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
-	>=media-gfx/imagemagick-6.9.1
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	elibtoolize
-	python_copy_sources
-}
-
-src_configure() {
-	python_configure() {
-		econf \
-			--disable-static \
-			--with-boost-python=boost_python-${EPYTHON#python}
-	}
-
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir emake
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 472a7adbbacd..99a8af55c390 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,7 +1,8 @@
-AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
 AUX pyzmq-19.0.0-tests.patch 6686 BLAKE2B 91ca18b17331f64448b151269c971ce4dec01b753f00623ea5570a2694b5e2dbbb457c420f22772e8471228f1042da656b06ca740f79f7d6b9ef0d18b8176317 SHA512 971ed65fb299f865edc96c7e138f65cecbed9de526ef10f412e4d81a53c4dc4d65512455bc2ca17c0bc24c09d7bfd7b79cc4acd08f93b517f42466e2b1490836
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1
+DIST pyzmq-19.0.1_p20200608.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 EBUILD pyzmq-16.0.2.ebuild 1619 BLAKE2B 3b39a4d1e4f8d022c7cf4371a87145f54dfbf0b99ad187cde7ac5ac91505689cebac3f86519d70626d8eda9d116450fd6dd129bcacafb7e20b0b3915cb0232af SHA512 a81331c8dce0335290e51cd2423841d0cfa07a8092c18bf800561cbbd8472259017abe78ce8984da6d44e7b8f9c8c403d25f17884fb5ef1e2dd591fc95c75ab3
 EBUILD pyzmq-19.0.0.ebuild 1543 BLAKE2B 416944298550b4e5fc76591c4cd9727f5c1dc162b585050aeb343b667406fa398f4d0396809bad04e78d4f4f1044e5d57ed9ba9f5bba77008eb0d32a085bc0c6 SHA512 ea0593aebe18e5c3c371b7aae95737dbc405a101aa20704860b599e0dcd4b878c15a68f3b5a6b9724be70bb5a0c7544ca1be53e4ef016692bc1c8ca71f8925f5
+EBUILD pyzmq-19.0.1_p20200608.ebuild 1502 BLAKE2B d2db4bf85470754dae4b3f848922cfb89464f7162eaff5ae8cc0fba54bd722c88a08764c3323729ed030998e70491c8367c31c6dacc3be216b53d71f733745ac SHA512 cdc2d41d19b563ddec84c6ef24125eb1e2bd91ec42ac907f38fc5692e03f03b8f34556541391cd890ce8086a350758decdf4254de95f415dcbf8f43fee03fa9f
 MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7
diff --git a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch b/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch
deleted file mode 100644
index 66d0de75e38c..000000000000
--- a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disable hanging test
-Bug: https://github.com/zeromq/pyzmq/issues/1202
-
-Patch by Marius Brehler <marbre@linux.sungazer.de>
---- pyzmq-17.1.0/zmq/tests/test_message.py
-+++ pyzmq-17.1.0/zmq/tests/test_message.py
-@@ -14,6 +14,7 @@ import time
- from pprint import pprint
- from unittest import TestCase
- 
-+import pytest
- import zmq
- from zmq.tests import BaseZMQTestCase, SkipTest, skip_pypy, PYPY
- from zmq.utils.strtypes import unicode, bytes, b, u
-@@ -262,6 +263,7 @@ class TestFrame(BaseZMQTestCase):
-             self.assertEqual(s,r)
-         self.assertEqual(s, m.bytes)
-     
-+    @pytest.mark.skip("test sometimes hangs")
-     def test_buffer_numpy(self):
-         """test non-copying numpy array messages"""
-         try:
diff --git a/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild b/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
new file mode 100644
index 000000000000..56869da78599
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+EGIT_COMMIT="dd4dac055152d47c829034224cdecf594c7b3f12"
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://www.zeromq.org/bindings:python
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+RDEPEND="${DEPEND}
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pyzmq-19.0.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_prepare_all() {
+	# probably broken with new numpy
+	sed -i -e 's:test_buffer_numpy:_&:' zmq/tests/test_message.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	distutils-r1_python_compile
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 41786ae43bc5..6b5d96e04921 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,3 @@
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
-EBUILD qscintilla-python-2.11.4.ebuild 1783 BLAKE2B b23c9d710d982891edd6a91d9fdca80c7ce1a71364ccf08b6f15d9457c26eb5510734740bf2a88b9e28abf5f0449b1a3acf0ee6b92e8fb7c268ac8351ca6a4c0 SHA512 74edb6ae17a10ac25b68d00b55c390482e8c9683e76ed92bf3cf90c88d4eaf859f5fddcc6f7fdae5b86adbada703a25471fe69edabc988eabeaa22832362c34a
+EBUILD qscintilla-python-2.11.4.ebuild 1782 BLAKE2B 2484322cc56bd746192300cc954f2c5af3041b2b48db25f1c0f952357bb0b037c398727c5161a7ab9aea63586207fb1989c87b599160c0e2e088341ba8356da2 SHA512 26836958cb815c272ffeeaabb858f296f586af6d49f98202dcb975fc83706f964b43cd40f607d1586c0294bea9af35032a562c4c982d72d53cd974518ab32a20
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
index 637cf8942925..27a43b25eec9 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
@@ -35,7 +35,7 @@ RDEPEND="
 	~x11-libs/qscintilla-${PV}:=
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
+	~dev-python/sip-4.19.22[${PYTHON_USEDEP}]
 "
 
 S=${WORKDIR}/${MY_P}/Python
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 54d7a2a3b0b2..312aa6d50706 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,7 @@
 DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
 DIST qtconsole-4.6.0.tar.gz 426936 BLAKE2B dfd61258e2e8a0ba74421253f39392e2daa04acfd072361488fc93087e2aa4daa62203e4da501a24db43a79eafe7eaa8528f54edbf7b6bb6d547521cc92b8829 SHA512 196022af0d9ebe9e065bf46c07f90bddb2c314d4f0f778f828e20200b11085150ff3ad3adac944496b778b926a0ccdec7903de27be25b79be7fe3ba867148b0b
+DIST qtconsole-4.7.4.tar.gz 424884 BLAKE2B 79380a1619498a28eaf7e741a3408a63b58705fe7c0672108b57c5cd9bb7c35d77569ce59a3cdb8dc21b3e403cc41845a534c55838ecf2e82038677132e90fbb SHA512 4564c0ee15b1feaff235ae35a22bfb719497e5f74416ea0ab471018c4d68e13dd05cc4d0180b69151f81817180d4985589340698067b5a2166764a39147255fa
 EBUILD qtconsole-4.3.1.ebuild 1680 BLAKE2B 249564f33745d57c14439acd6cec7af71829d3d31e4982ee5c57ce71ba469053cf5d5932f4480d1f30f3f0556b27bf2d57a59de54556673568f282011612fbb0 SHA512 ae28aef823f50eebce4ec374704bc83ba3accd1bd1a9df72709dbc3c46c8a45a74f5e33667360fc8b64a349210368ae4d5151ae73cb7d13f70b839f168d9b3ae
 EBUILD qtconsole-4.6.0.ebuild 1283 BLAKE2B e551099568780f4f9e05dceee530499b8e7953d8b3052a7a1b18125dca93d9df453ee7ad76da67999865acc6f81ae9946a7965c69e71de66ff6292e1f8bc2139 SHA512 0c48143d092b3b582314c07967bc9be1c727fcacbf37dc60676a7b6f146d17826c79fc847cd31feb194a16c093885685da1fb41af06e1964df2f362c60a54569
-MISC metadata.xml 557 BLAKE2B 09988fd98b75ef9c7847cc1035f6d8726375ec61638dc9ff01c0ac9556ce16afe987a66e0ecd674a376fb9af39ec2c721e04abd829f1153652d8eeee82c089ff SHA512 5f176e9d82b9031b0d15c32986074431f03e33843a50f68e94d7aa0ba10c31370e2c4ee0651481d7a5b42f873e0aec4771c9fc7ca996386286255166be20d8cd
+EBUILD qtconsole-4.7.4.ebuild 1236 BLAKE2B 1c5f96f1dbec7e23921ce0c3d273b90b0db9601ea9daaa5459369a2cb78f227bc979c59ced22cda22311802cde2dd9efe818ef4d81ba7b7529ef3b9c8abf22de SHA512 961c7732cd730e3c6c0029b4006cc173226c50c813ea8644564f73f22dae9e4a7a89e88dc7010c1d90250e7b8e743a6d1ffb05839de99828ecf710ece40031a4
+MISC metadata.xml 664 BLAKE2B 33ad7b3510f6778cf805068f3edd12fcb235980ceb60d06a94e977be60372f1bb8119545a47ba04fbb636a6cb9c072ae1e2581cbe71d3b7d598cf54c5c99ea83 SHA512 fdb5f97ebbd75a451b1247fa015fea8ded2b428453be34140bd5151d2c0a9cba74cd91258903826dd1e419bf8b818c37f3df74ab2b573119628b9b918f80f69b
diff --git a/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
index 1c4f5a322518..b4be59fbf857 100644
--- a/dev-python/qtconsole/metadata.xml
+++ b/dev-python/qtconsole/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     A rich Qt-based console for working with Jupyter kernels,
     supporting rich media output, session export, and more.
diff --git a/dev-python/qtconsole/qtconsole-4.7.4.ebuild b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
new file mode 100644
index 000000000000..b9aa30d6b720
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="http://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},svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by removed tests:
+#		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/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index eb9afb7e6aaf..74c9baae1a9e 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
 DIST readme_renderer-25.0.tar.gz 24116 BLAKE2B 978fc6cb9d92e35a618af89996abaeecb4611f0351975af44341198dc26ccdba4c0a4e32c126ce22fdbd77ca1d2dba4e11f70ea814a5084c204f4cd53d95f7d2 SHA512 2decdae26c07824c7148b0d49f58fb585fa4e78f06ea97cd7a1fe2fa4ca17601d255eea4b96dcb384c676bc6b671caa0a1bf51615223cd48081ab18da76944a5
 DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
-EBUILD readme_renderer-25.0.ebuild 833 BLAKE2B b6086ea8e3005725db305877461bf23aed9c50f55ce333b6930aeff5763ea3d27cc5fdac9405ede7535af3175da733227ca8b26c7055400bf3663d54628c8684 SHA512 9c663b704b916d931d0ad0da53aee5b083b00b90b597d35d537aae408abe1738dc2bdc20799a1e63c66bd71b20947df954b5665b48881ecfa25290bcc4e8a34d
-EBUILD readme_renderer-26.0.ebuild 819 BLAKE2B 2f019d393d41c720d6e3130f4264e73926653e3176b760fe553c1a7e91ba04ab9c1fe913298c5726e54a9072f744cd7d0a2202e5f855eb81346b925b76519446 SHA512 fef21be967e82121e41d5bfb191d98fd070ac1de29d4dddf3f290f3b9fefb4a7f4a1276283638f64c5dd9d67018d7e76d3c7ab5337460f2c4b0c5b408b11d3d7
+EBUILD readme_renderer-25.0.ebuild 838 BLAKE2B bc78fd9eead45397bda6676c10ce44c131edaa0e1e0c2900f00ad1409518ee952ec77f8f0a253740d97fe22846ae2e813b3b07662d64dde40f3434a9e7f76271 SHA512 6497d3f5735c1a8cb334f2f5433782b6712446164422a26aab601b5f8a4b9c3ef9846d14c330226015124679d87c202a8d689e6b06f9e6934f59514e2f4118f8
+EBUILD readme_renderer-26.0.ebuild 842 BLAKE2B 4092a8e2f2d59439c9723e09d47839970fefbd1268e29da0818eb75d33f5cd48bf1c01a8a5574444c5c17e762e0ec223a618e19352f69113028c3d2797b1e300 SHA512 22eec30dc8af1ce076551a0b78c51dff2b5b8f4edbc59f2a77f8e70ea9fe01cb91eca239dcffec014922cbd3f78dea4cb2c903a13d607be61c0d66418408f7c3
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
index bba087598141..742f1a80b007 100644
--- a/dev-python/readme_renderer/readme_renderer-25.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/readme_renderer/readme_renderer-26.0.ebuild b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
index 7f0be18898e0..32744b6eb0dd 100644
--- a/dev-python/readme_renderer/readme_renderer-26.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/reflink/Manifest b/dev-python/reflink/Manifest
index 75cb18ad6177..88e1d4ceb9b5 100644
--- a/dev-python/reflink/Manifest
+++ b/dev-python/reflink/Manifest
@@ -1,4 +1,3 @@
-AUX 0.2.1-correct-test-deps.patch 325 BLAKE2B 33600ee1ffe704b26ba310dcdf4bd75850a6c8805e184f0aa90194600cf1bc6bf3005978ad957dcf2b8f14ea5de31e35f902c6304974f644c755013e4c6451fe SHA512 bafdd031a205891dc171a0ec0f8f62085c15ab7909e405444e88c6fede2f8640bcacc3e9c7f5e99244320770fcbcbf9009fc9da06d838905f7a388f7af124894
 DIST reflink-0.2.1.tar.gz 14638 BLAKE2B a6449ebb27619ead9ff8452df6c48f3617e5f06eb347fbbe14ab00b9a43c01de8e101466288ac6fb73602165d4d4e9315f941c2f28dffe245ed2c39a10a61cf1 SHA512 5995ed787bda93cb46d99a603110768087420edd72c01d5f3f7f08a3f8f63b4629b900a3c173dd7f3119a892ac19ab1a9c3000ddd83810b22a52dfb5fb892a28
-EBUILD reflink-0.2.1.ebuild 1002 BLAKE2B 79b11b0085cf23300391b46619b4de00e32cfd7ece60d0b651cc9b55f61038b65cdcdc8f45c32cfa6042512199821adc0e1e9662008ffc5d65fb782e171e580a SHA512 64c98430658d65dee82ac922a0560dc3a9879f141b8b06bb6bf0533cb7dbc9ddf5abb6c89f9ced3171780a2dc02ef311532a9f0a72b365f62e28af8d3f333a95
+EBUILD reflink-0.2.1-r1.ebuild 1135 BLAKE2B b0a416dae3472ece3ec62d6ccf9d7d14ceb0993da7184d7060908d8d74b2d0a3d376e7748b117cdd06559c5189d10ba9fd74efb2eb39c10478c2feef59bc07ca SHA512 aa43344df610744d164d6aabeb4f8a25654a6911daa02fd8bedf8d0542402c8c36e2f77caa5829b700c810e549be91ce95c07c33ebc17f9e04b2bf61dcb4798a
 MISC metadata.xml 493 BLAKE2B d7e0d0236537a68ada8c267aa6a2d6803a4f88e82938a73a7bcd0cf9cb5567177745f5fc2c1d81e92f17501672a430439845be6c63b7853cdf927302259bbec5 SHA512 8a4c8db0dc28f8ee0d6bd855554e8cf1f7661f5625f37ee04483fa918ac78d238487f1246dca1c96f647ccb6e9a35bd22b171d659ff06cd616c369d01bfba221
diff --git a/dev-python/reflink/files/0.2.1-correct-test-deps.patch b/dev-python/reflink/files/0.2.1-correct-test-deps.patch
deleted file mode 100644
index 78b1ef8fd94e..000000000000
--- a/dev-python/reflink/files/0.2.1-correct-test-deps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 234c92b..3ef3237 100644
---- a/setup.py
-+++ b/setup.py
-@@ -20,11 +20,11 @@ requirements = [
- 
- setup_requirements = [
-     'cffi',
--    'pytest-runner',
- ]
- 
- test_requirements = [
-     'pytest',
-+    'pytest-runner',
- ]
- 
- if sys.platform not in ['linux', 'linux2', 'win32', 'darwin']:
diff --git a/dev-python/reflink/reflink-0.2.1-r1.ebuild b/dev-python/reflink/reflink-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..ab5936518e0f
--- /dev/null
+++ b/dev-python/reflink/reflink-0.2.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the reflink system calls"
+HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	test? ( sys-fs/btrfs-progs )
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local notestmsg="Tests need FEATURES='-usersandbox -userpriv -sandbox'"
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "${notestmsg}"
+	elif
+		has sandbox ${FEATURES}; then
+			ewarn "${notestmsg}"
+	else
+		pushd "${BUILD_DIR}"/lib >/dev/null || die
+		# module import will fail with any other directory structure
+		cp -rv "${S}"/tests ./ || die
+		pytest -vv || die "Tests fail with ${EPYTHON}"
+		popd >/dev/null || die
+	fi
+}
diff --git a/dev-python/reflink/reflink-0.2.1.ebuild b/dev-python/reflink/reflink-0.2.1.ebuild
deleted file mode 100644
index c3df5d3b75bc..000000000000
--- a/dev-python/reflink/reflink-0.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper around the reflink system calls"
-HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		sys-fs/btrfs-progs
-	)
-"
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# goes places, like writing to /dev or creating btrfs volumes
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PV}-correct-test-deps.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index ff88a78562f1..804af80fd54c 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -2,5 +2,5 @@ AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e22
 DIST regex-2020.2.20.tar.gz 681215 BLAKE2B cc23ec03dc83068320155e4e660ee27e00935d179566d007e21879506f80dd67b2c1abdd6a4dac789a239474a8b3358f1fcbcee53af91b3d2b7ef71ce19c7ab1 SHA512 0a35b9512048bd36bcbf8a03905cc77f007d204f9ed9a0aaa3d5fcd72392bf37285c35ec0f04b1520e486b651028063c799ec265782c52ca4ecf7eeb0581727a
 DIST regex-2020.4.4.tar.gz 695848 BLAKE2B 0dc41e1f1464014bcdc10b7209f7ac0506aeb6a3e09c16b4ca302619aaa8271cb06138627e8ed7f64ff80cf661eb83f07b4514828cf7fa94f21211fc42ae9f7c SHA512 95eadaaffaf87a19b31024ad3cff670d34a31de8b9be430fc276a533a584203842d1634b66a346c4aaecf2407b973bb1ae9c8ee8b48785d03bd5e45a67a271a9
 EBUILD regex-2020.2.20.ebuild 885 BLAKE2B f0de99b16a108fa8f8482715b6bf5f5d8c7c9f4bff71e99639a3d237ff82ef8b7780ff09809cfc242330b634ce49da7923acde092a14e989f4d806f5a5353c85 SHA512 e7cd546f566465ed6604fe4f72533448e7291bacec1f068ea40e81c8578a2deb93d0c50437357d2c303dc15ae503a675377f1a06aaf58c4587b0d7cba916e8f5
-EBUILD regex-2020.4.4.ebuild 894 BLAKE2B 72c6020b524175c08615e168e9cbbd93051492265cc5b2ba834c29fd3f9c742ea45dab15419377b07acc7f74e1fa59b63532cb1617ae9e6b418d357f7b9c9e59 SHA512 e1aa267e6e7b6e1b6b5517694caf750104b8f29f6f17327fe9af4725df90c002c87e3034966b2f71924f7660d66126aff0ec310b9876f5e3c9a52a8f2dd13a75
+EBUILD regex-2020.4.4.ebuild 893 BLAKE2B 5875deed47eda7c90cf15b19012caaf9483bee3f9b42f7c33008663fb09f6effcc6aac5a2391b5cedc9feedd66b910ed1509583dbca83ee997c4323823e4749f SHA512 f8c28aea15eacae904ac7bd136ed554352069108c68e4c094fc7a167ed0d486475e208ab53d9a5853fba8b9f4ea50cf8ad41146bf34c7d54314c4d23e440fffc
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2020.4.4.ebuild b/dev-python/regex/regex-2020.4.4.ebuild
index bb8200cfbc76..bd9de2dce63a 100644
--- a/dev-python/regex/regex-2020.4.4.ebuild
+++ b/dev-python/regex/regex-2020.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index 1808b78ad1da..bf32e75886ef 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,5 +1,5 @@
 DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
 DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
 EBUILD rencode-1.0.5-r1.ebuild 507 BLAKE2B e77e29feba0823350f3abd5f0c65301f3d52eb35e80574b9c992f8da8ddc0cf8ab2f4448d7d0342171a8ed01720caf70877886df67993148725960699ce3e5a2 SHA512 3b4cf0843befc39fb1a634f1ecc82bba4afb413714ff90c50e9c57decf70e9e4d1289e582c29776bdbce1cca84d26afd418c8c23ffc855112e2fb6e86d835c81
-EBUILD rencode-1.0.6.ebuild 540 BLAKE2B 03af77a9982bb825d5c04532eaee2f2a38339ff2771b7d0e6f96f2818fb5127fdd4c8e6b4a5afbaa366dc6de4c8b74380f1a0a35137413d3967f550cbe83123d SHA512 e5da0409c3b78a34503a5b38cc470b717a49aa42923473ff40f12b055db0ffbb78aae42d994ff3f2071ee278a109aff508d8b8e7a71d803842aaad0c28657713
+EBUILD rencode-1.0.6.ebuild 545 BLAKE2B dfb3e0cd92f76f8e5cc277049a75701ac6570061a5c5cadb2d08099e2cf40f509f4acaa3e743549f80ceb32ff92ca28a82a39ad3f9b62159bf7e0af0570d7e67 SHA512 aab61ecfbae26968f911e382d4d7294dc96933e645efbe75f830a954499850a761ed2c8137df38017ad35bffcc95338e64991afda4e00632bb5d79cae3f63ad7
 MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.6.ebuild b/dev-python/rencode/rencode-1.0.6.ebuild
index a284fc91aedc..b1eeadb23af7 100644
--- a/dev-python/rencode/rencode-1.0.6.ebuild
+++ b/dev-python/rencode/rencode-1.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 4e004299ffe6..17eaeae5383c 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,5 @@
 DIST reno-2.11.3.tar.gz 73296 BLAKE2B a09c79c12945396425f2d3a45259e15e1fe8909df107de90884a51c87a5f4ac9f425907c1f9f401417d979e8762f80f188d2e783a7ff36541c107a9497a12746 SHA512 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c
 DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
-EBUILD reno-2.11.3.ebuild 653 BLAKE2B a4c47cb39a32a259637eb0de85ab5936fcddeccef31eb17e1e12661535deaecdd91dffe415152b53d95466ee92687c702b7b9d23444fa54a97f6c134cc5c0cb5 SHA512 a3615995c7612959cbcf06ae8d70718ef7ab730e7b318ddf90c81d25247805f9cdf5e150851592d370bb82c01f37b0f36b75ec4aafd864e81167a839bd629b31
+EBUILD reno-2.11.3.ebuild 660 BLAKE2B f8ef3731cb902f8c15dc554d97f77ae0fd5b7caec41f04a15ac900b2c58935564a078602d9d659d03fad651608a570ff2491bb173ca356c480271eb15198a986 SHA512 00c361e8a9e5277db4f75430f187ef4f502f9bd9b66d8276bf108ea24164fe42ddac705730a82d4dd69f33f042dc172590505a4ed05aaf2c3b42ef439a22cb75
 EBUILD reno-2.7.0.ebuild 706 BLAKE2B aa8edbed47032a22469d92dba873d39f254977553518b906a66e1a7f3e7ea63eabbbd5eab690c24117928ee378f0a3ea68c43728d1ffbd44d6f00538f2b3800f SHA512 46ce5fe99b2ee072273fb576c9b6edc980848133ece62e986eb5db11603711c12c9c117749bcb87a3d42a4db2143ea7986dc82f26d3fb7f656dc72a4396aa329
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.11.3.ebuild b/dev-python/reno/reno-2.11.3.ebuild
index 1249c20a47b0..627cf75489e2 100644
--- a/dev-python/reno/reno-2.11.3.ebuild
+++ b/dev-python/reno/reno-2.11.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 6571f2075a0e..32f9e61b7019 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -4,5 +4,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
 DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
 EBUILD reportlab-3.5.13-r1.ebuild 1505 BLAKE2B 972c797c403b1732ed5edcf1e238cc869cb858317ad1c12fcf251616d7c3ab8a6852e2b564d48a67c2a99cbf3c4102d19ed40727568f94d79e7b2f8334cb61d9 SHA512 4bd23d58e77eac4dfec4240894ef7fcbe856ac2f1f6e7fff217c8418584a8ca40a3fc14cce940ef16e4b7595a3ec32a839d873e78f622e2940086215ecbc6a0e
-EBUILD reportlab-3.5.42.ebuild 1347 BLAKE2B e1bcc17a6d369dfa658b30aacc9769acce8e8f2e586943323cc0acbb21cedf00f062aa134baf25b2d9c0b6d203f6c72e41ff5631c5ceff69f3fc4d48ae8302d5 SHA512 3849a169b5855916aabe4a6d97d2811e98da64abdc80df774575bfd096e41babf82aeda2f2378d331fb6d6938788816ac5a4b88ea94175ffda10ac9eaa0d954d
+EBUILD reportlab-3.5.42.ebuild 1341 BLAKE2B d87fa7cb343d0b5d306045bc1e69f10566eb0f142b599131350eec98cd984ea91c2db5d20b386723771c206bc2aec88d06acec1fe6d15409d9790f73499ae625 SHA512 cab97db2c7a559bc516d7d9be0340280103294f3d2448939dbe64b3457214329b379aed40637e5f18cd0c07367400bac7d746b74e0e2472d131853493d94ea36
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.42.ebuild b/dev-python/reportlab/reportlab-3.5.42.ebuild
index ae55110a73aa..9b97a79d088c 100644
--- a/dev-python/reportlab/reportlab-3.5.42.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.42.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index 0e7af7d8502b..526450b78748 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,3 +1,3 @@
 DIST repoze-lru-0.7-r1.tar.gz 19489 BLAKE2B b0a33dab1fd69962f04e9c088b005a2a6d456ec8dd17f628b7077b51841bef5e9503034959c8b89e84bf5c471d9366d467ee6b7a610508c4b098775532628fc2 SHA512 52e7ab83979d34a4f0c97e62600e64bf430ed0311120fe948f6b407b7713446d5e954c54f811b85ade74eebf2a4d54653c12c38d07bdac51c456aea86334468f
-EBUILD repoze-lru-0.7-r1.ebuild 705 BLAKE2B 2f9bd3ff59644258e877cce77ccab3c9fd69154e6b908be3b5cb3770f1899860a6d5f17ce9e18790ee3eb6005e29654d218b6d4674a7bbe1049020833b492a63 SHA512 7a2eef617ed55d49d171d6231b679fbf66123e1adcf36b747f9f8806d36d3c82d81be2fd626fb44882a22a45c96f3b7dc895c5e7cff2f5ab687bdba4c1e2c809
+EBUILD repoze-lru-0.7-r1.ebuild 721 BLAKE2B 80d1c483f5f5970b96c71d218bbea46bd30491495a1aae70071fb86e5eb015bee2d0ac3d367a2baa48c340f696f88a13c2a44ea468adb877c09f136f96abeb20 SHA512 381b2de86127277f1b53d4c50908e2e2bc9adccece4f4a530f30847d2ae2448a97cd1bd7512b242b2b5b4ecba7947e9a624f98f04ede105d628ec117500d3e5f
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
index 36b24b44d699..1f6d58936640 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 3e5fdce95669..b430d1bce2c6 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,5 @@
 DIST requests-mock-1.7.0.tar.gz 51705 BLAKE2B 1104422ab28678ee9e964fd853e7d61c23bc2f0dfb3861c2829578d1f91d533d195ce687fbc8596aba32da4b369050398d891125dc894e55fcb73ca81268b30c SHA512 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2
 DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e338cec6f3fb718564026d28ea06ac975073f291be9cb685f012c803fdeca1fe29139537529e292b91a3356f0b781f97a SHA512 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918
 EBUILD requests-mock-1.7.0.ebuild 1238 BLAKE2B 7947c44ed2addbb388d0f7b7d9fafbe8d99a451b8b9fa84557d9250d9f465e80de6e1c94ab47a01223d19cbf85a16a56810c63e13fe1c8d5d8b5accbc0ba788b SHA512 d8e4d920e4113e5a2ffbe1acfcf49bc040c3b8a57584d0aa1c26d7a69f5f4f55dfddc9ecf53ea484c9a52af96828cce82ccdea0f8719593022809f135c422b36
-EBUILD requests-mock-1.8.0.ebuild 1278 BLAKE2B a2b64e16bcfefa5f2a13ff7317a52cddd7619d6426c0156a808e783ffdf3f714bc3e5f6ec0e5133ce8399c9c5e7b4450f1274a57791cc8431fef98d87ef083ec SHA512 9a7bf959b7961147c48be58b2d948751e4d7f7a08ee0ab42cb5f8c515aa45806715d9e6e1267d859ee3a9e12ef706122f0d964d4527e0a8cc936d70cd9530f8e
+EBUILD requests-mock-1.8.0.ebuild 1283 BLAKE2B cbb24a681301ed2719c89e3140faca77b58d14e97d06e3a45d58fd85892790dbdf05bc4aac921224ae68636b60b77b1fba31fa4f5c3e292d6388b47855b60a38 SHA512 4630dd8b77092879ade5729f6e7763f9d3e24b90b1ad981229c69fd4c0e1d78f35b3d0bd23ef42b2144da1e172180026150ea5276c0f413a6a60f36e82f47908
 MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
index b0fa9d1440ee..09cefc3c1402 100644
--- a/dev-python/requests-mock/requests-mock-1.8.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 88228a72358f..0db798d75728 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
-EBUILD requests-oauthlib-1.3.0.ebuild 867 BLAKE2B 0eefaead65ae591eb8af9cf8d1facf3acf0c22c82a76d472a87092effb3fd1e912cab6f8b5b18792380e6dd843ec67c1c1753b224c4e4942e55bb9d14fd9e18b SHA512 dfd04024979d42062e7fdf1171419a2479965408180f9ed50b278f5690129d1a3c45e1a7aab51d8b8e6a66f7aa4abf2b6ac338f27a12e45598782c963a5cd715
+EBUILD requests-oauthlib-1.3.0.ebuild 872 BLAKE2B e747eecde2f676da5b90895c6c5fb60b7d520e2a0d15991fe0ece10f30a5757a57bd3d8bd878e9dec4d583c3168e9886a803183510b9f8165e98b4f523f7d815 SHA512 1c95e84889b25abca6107314e7d1e75d1388a0d533f829ce5db171aadef6323342d63b16f85806f58ad5b812d70691155a5c011c21b6ab3017dd68e798a9a0f7
 MISC metadata.xml 331 BLAKE2B 7b904925adb6f8e39c1d1000e87c287ce5dbfa7a6e70544ab599b5ca8d254e70976d444149ee2727b4186d97326e662bcdacabc674f7bcc0e0193b2807e4c053 SHA512 871f44e56ecb16ea43e5702c30a43d24f911ae1b83fb2a5ba3ca4ab45b3676ee7d4841fc343f336c0249b0165777659bd393160728cb20e3484eee4854919d1f
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
index 8b1032734ac7..e6ae2625f9e9 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 6a9f7383a2a1..a9c99835c2df 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1131 BLAKE2B aa0ae04f47f16018084e05107eb6d354c65fc38f82bb2023e6b58cd8d20e6174a912f138652d791495444a9d15d0bafff263569dfb508ba551f4f80cf3c98c15 SHA512 a3243b1502c7a5e2de3b4f294fb3de6d979c033187388059578c293c1352e5a910b1955a5fbaa4e242759752d5178d10c805863a09e188b006359270eb514ff5
-MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
+EBUILD requests-toolbelt-0.9.1.ebuild 1142 BLAKE2B 21c77f4ba79d90284316a4a226fadbb9b09ccd375c762b817a1d8354108a3f5a9403c7f6e5209c3531e0ddf436a13ec265332684550e3d4004d1a80c5134f78a SHA512 3155921a9ab85f8a51fb681fdbf5aace3cd9801e8d2701be6c7c5cf9b10776e5bee68297a0f803be92ca725bf2880ec87297fd3e5b33789c1216d1548e26b2f1
+MISC metadata.xml 398 BLAKE2B fcde3c429bad373cc0b0f1c155b217a69aac285add9c7ad92b50d211e36ccbed9e8d6c8b4d3cf42ce3250e614085bdc241893a6f2354dfc8b7e6a60a8924f58b SHA512 57e6affb2231a071faaa01d60bc44832eafe1ae5b927383666b230492fbfcbeb27e5ccd9d06308041aaaa1626289b5e1328fa1ba1be6d845564dac56b4fe3321
diff --git a/dev-python/requests-toolbelt/metadata.xml b/dev-python/requests-toolbelt/metadata.xml
index 33dacd3a88b7..77f35fd2daf3 100644
--- a/dev-python/requests-toolbelt/metadata.xml
+++ b/dev-python/requests-toolbelt/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">requests-toolbelt</remote-id>
 	</upstream>
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index 56521569fd3b..e56387117e47 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index c875ffe24a4c..33701045f7f4 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,6 +1,5 @@
-AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab467ccbcd2020ea41ca49299688e2f88127e0b7e67545eb62659ac2729ca02b46d1e5a8c015c1d6cdd6a5ee0f8170cd483 SHA512 1de7c78c51be49e4004decd28d40e183a44c15b1e321c41595abc114ddb829ad54fc02dfb573a620cfe71f0996b78c822cb37cd68b3fb2d8e395b5f829227496
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
 EBUILD requests-2.21.0-r1.ebuild 1423 BLAKE2B 99f0a4cfe05110aae07cc2f37614331a31a0434d2210329c01bc3625e692c2b87e2ebaabfb1f614ebfa5bf1a561c2a0de84699d4c05baa877e59b03bcb9d80e7 SHA512 c086ec4cbc080d4e650dff189482d84cffbf3ad3a0cc7bcaa2cf95c09a8b78f70839dd414ce35fa7b5b35cc22e69927844cc07ca9d58384944f49c1ad950039f
-EBUILD requests-2.23.0.ebuild 1726 BLAKE2B 931d765622445c5357359b059a88a019c8cd3c19b30d28161bb5e5f2841d75bcf690fafe8a3f8ebee5cf1609666784bf46844b7531b4ea93d1dd59e9875e18c1 SHA512 37fd44c97c186228f3a154224ef1bbfd8740d54e0a9a8528ae90a9101e2e6ede7213235791ce2c84c0c416978806e0f7679a75f19f5f295f444efcc097e37599
+EBUILD requests-2.23.0.ebuild 1732 BLAKE2B 01f605e552fe11e164a98fca79f0f3c57bb33bce116f1ce3459b2834521c63519bf35c517e074116e8ea3c308ee85861fd2c7eb8263ec0f884223bb3f66b4563 SHA512 abba3e4e19049ec50def900418a0acbcbf0604e5f125a3d96e1a80696bd98570df6a88a384b6992b987e9bf3456ed08720acae0e2aedc052962f090f4b516c29
 MISC metadata.xml 744 BLAKE2B 19542f217a9eef39ef564113f3ca4e4c6d443f15cbddbeaf3f6f388a883bc5c4c580f3f3a9d61c72e2f3176cad8550045b3c22a845c8ffe0a5489fbcd579e9a2 SHA512 4f2d9ed98b518691b0153f35b7e46cb065e2b89a738a337c5204b3da484df4a148cd8f770dfa631ee002db9468512f165ca9c5e0bd505a367adbb59d4a6b3ec9
diff --git a/dev-python/requests/files/requests-2.22.0-pytest-4.patch b/dev-python/requests/files/requests-2.22.0-pytest-4.patch
deleted file mode 100644
index 5b8ec34912d9..000000000000
--- a/dev-python/requests/files/requests-2.22.0-pytest-4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dc75b3ca0b4c95648eb07b92cb414394d99c13a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 8 Apr 2019 18:04:22 +0200
-Subject: [PATCH] Support pytest 4
-
-Fixes https://github.com/kennethreitz/requests/issues/5048
-
-See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
----
- setup.py            | 2 +-
- tests/test_utils.py | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index 59b0b0efa..62c51494d 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -33,7 +33,8 @@ class TestSuperLen:
-         'stream, value', (
-             (StringIO.StringIO, 'Test'),
-             (BytesIO, b'Test'),
--            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
-+            pytest.param(cStringIO, 'Test',
-+                         marks=pytest.mark.skipif('cStringIO is None')),
-         ))
-     def test_io_streams(self, stream, value):
-         """Ensures that we properly deal with different kinds of IO streams."""
diff --git a/dev-python/requests/requests-2.23.0.ebuild b/dev-python/requests/requests-2.23.0.ebuild
index 6fc007d93763..06a4849162d5 100644
--- a/dev-python/requests/requests-2.23.0.ebuild
+++ b/dev-python/requests/requests-2.23.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index c1012743e687..4d596d6a9171 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,5 +1,5 @@
 DIST requests_pkcs12-1.4.tar.gz 3884 BLAKE2B ebeb89349163d4f9995c00dfe3d725036a76660870d36203f47029f225698fe7a15993a9dd756e0b6b33011726ad26323962609bb94f223f4478096658f20a3c SHA512 f77703b7b0ba1f13aa095fcf4955f119c34a20e0601e0d6888a29932d8d4289548cf2b7b0e065abfea2ebcda542d48a4d9a3ded32974c1d24bdae223893f0241
 DIST requests_pkcs12-1.7.tar.gz 3914 BLAKE2B f91c7d1677964cfe903b4c0f688e25b5b3b7eb921fdeb4e794cbea24ceafe4e44f7587df48c0ad56ff20114641f6897ab4ef26a64b53e6fcb7d713ecf36bb1c0 SHA512 be3fe00ef405b44d9f160ff35c072b86da511a68380e2737e9316a0d1dd89c3d8ba7adbaaf9865ca01cfbbdb85c477364780cbe3e77e2963dcd7b54519a95356
 EBUILD requests_pkcs12-1.4.ebuild 563 BLAKE2B c1a003b7ecdb6a56e01d051e979183c6cf609383ffce06cf079e3bc6198be23a4e6dcd3647a8b8a6b97300c05c4b8964ea0093b944e9eb3b92e3afb5164d65aa SHA512 c4f0789660a93185f63ea59d746197f0f86fba1b29d9fc16b79d6081dd4f58802299d383a15d8ca05057ad7d48934b387558b68251036c88e9584d20563352bb
-EBUILD requests_pkcs12-1.7.ebuild 565 BLAKE2B ad82358213a814ec4afbfe173cff31bb78b704ae17061d1cc2f522f64444be092e764f0aa541569f2be5768822a29d2c607b1c9103d2a33798306aa59d863c3a SHA512 e862a7f9fa8b6bbbc1c89f9a144e5d8ca36d0639dca4a0a1afe6ed9ffb4e5bcec319c2ef2b7d72a3130c38ab08427adac9ae32794d62d447a6e495553cd0eb75
+EBUILD requests_pkcs12-1.7.ebuild 572 BLAKE2B 6cae730be2fce552b2fbe3fd5e85c5261ba43d9f7bdb1aa5084c5042601fb469fbd8bbbc6710aa932f91420a2fd40fec0c77a79498afddd7051d4835cb18a480 SHA512 d89773f95db0e747b6ec83349680cf10e00fb9e8017cb7aad992ddd7ef3138ef69143a7ce24265b29915e83ac86e2e8f9771b6bcdf848ec556670b4a22842326
 MISC metadata.xml 555 BLAKE2B d70dda6dc42c1a4da489771576e149a106fd0dae72477045e98a57c2fcd04552057d526b52da2c1b1ced97a118a6c0d914100ebe0e2996a12cfc55c9f66da128 SHA512 3ae1a29b15280f429202f4b031ffde905a26056964ba53610ae29f961d3f7c2562b8a5d27d701b3c1a72204464cf5c4ede628339ce3e6874aed62f127523f32b
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
index 3cf700117abc..1811f49c34de 100644
--- a/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
+++ b/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index e0b2f28241a7..a2b823900c1b 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,9 @@
 AUX responses-0.10.7-fix-cookies.patch 5131 BLAKE2B 48bf65ffb6c5cc1b2e1141aea27f0286df0959e61593a2798d76aae4fbb195fe1ce9801585553572a35db50ea1120e4841d6bd51e68461bd9e06b86af2fd2389 SHA512 1ad577f6dc4b8b708a35fc96675246397858f33f4a04be49606da0f25c9ec990f4e1ddc6fb9307f70e6a5e926aa92e5d66431c420ef5b76e73c51055e3ec0b7d
 AUX responses-0.10.7-tests.patch 383 BLAKE2B 3bca7b4ad5380fd13e29be1409d070d8ea1095a9b42636f5d7e428fc640eb9e0d5b3d0aeac8f2e128a3a1d32f30e1f376895708d294bfa6126687e79ce2ff97a SHA512 8230855b920eb75136e4158c0768ad249ba44933baa9f7b2dbef1e2fefea859bc67f65fd1601a11efe3d5a928b8f195ce6939aa0b659ea89ed09bf20cf106325
+DIST responses-0.10.14.tar.gz 24782 BLAKE2B 2c233ad41bfc1d9eeaaf84d2e8a98f5f808e39ffbb50c796aed6a3065827a0c33301c8d6ed1e7c4d88e6d0f7378796bdaba3816fd558f5797a725ea99835c54c SHA512 f7edf64d4e6d62fa7295b6ac95d60bc30adbf0b141d9624ed7ca03efe02790973aa8ebd3f93187d0fdb41e323c1d87184717b77bba2ea70a7ae25f4d9237314f
+DIST responses-0.10.15.tar.gz 25350 BLAKE2B 6d9dff99e2dc18b7361cb2b75f0438c62ab771364b1a572823cf1fb0cdb6175fee8c4cd372ac5d1b27ef31b88e66dd7d1410429213af240f6f743f0c85e36d1b SHA512 513df58b40968e271cfb429ee09ab2ca7c3cf2f6ebe3607276ed1b949670871f8d6993449cfd5871bfd119cda0c0628dce6ebe8ed40595696e550541413f12b0
 DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
+EBUILD responses-0.10.14.ebuild 891 BLAKE2B 9baf6db2b12499e56f721a5dce659df8b4c1dcc62e99693074a69c3482d9a41a99010471b93aa3197c1a5362fd4b0d6efad8df409cd30a3bd1d16b19de48c039 SHA512 71013aebf6c545f207574a33f2eef76dd74cb146f6530cdf707fd2f99c77d2a2e0d1ae87900630430341f9cd57a3ca2b2f12d881f913d9496748ad753a7acf7e
+EBUILD responses-0.10.15.ebuild 681 BLAKE2B 4320c6c1a575e494734792000f4b6d978d5b24e0555b4b077f291ef42cce0f739b91018c4042d9c50583205ee829875055f447710861e5bffd47c8dad4bb9f3c SHA512 6c55687cc49fb0d5505b3528ad96403b72714ceffc22fbb1cd868460799fa205631542424d5e3a76e908597788a3cc5a664b4f2bba2cb77fa6956615b7cd492f
 EBUILD responses-0.10.7.ebuild 862 BLAKE2B 23eeb7d1780bf4224202b1c5d8b21d086ebc1a209e5080b2f23d26e7ebde9a85eb461ae690dbfa58b5c6fe04a62f911a52dc0b6166d3d073f45918b15e02fb42 SHA512 f23013dae38c96db5cf025a3b83910790f4f70b2f28ac491b1355ce01cbd5d6eb3c4adbbf6bfded90a69c17829f49a737d85c31b12e73de0d53fcd77910e91f6
 MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
diff --git a/dev-python/responses/responses-0.10.14.ebuild b/dev-python/responses/responses-0.10.14.ebuild
new file mode 100644
index 000000000000..6010ef70932e
--- /dev/null
+++ b/dev-python/responses/responses-0.10.14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/responses-0.10.7-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# py3.9, doesn't look important
+	sed -e 's:test_arbitrary_status_code:_&:' \
+		-i test_responses.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/responses/responses-0.10.15.ebuild b/dev-python/responses/responses-0.10.15.ebuild
new file mode 100644
index 000000000000..adae6e7ab45c
--- /dev/null
+++ b/dev-python/responses/responses-0.10.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index 29199efce22a..a6d595702d42 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 746 BLAKE2B edff40876d0e23c7d8d549cf9921ac0a61f925c4e48049339914bea351ad17601ecdbe13a25d6494c2ff2dd03c1d8c480c83540733c40427afd5fcc177ce0833 SHA512 60a1bf18bef0f877c17c5333db20787d001041965868a357305b40844ec9f6c755d0324050a0066ec77dfaec268c90841a0412b4407c49e2319b1e16e80f0901
+EBUILD rfc3339-validator-0.1.2.ebuild 737 BLAKE2B 3d9339dc54af42737e3944e6ed1d40bd15c44e4d5db2c8ec24e255869b51ba62b4fe9cf48777c789d205e317453d2366045b4f29a0b21b9b22f0f53624b44bb6 SHA512 fb0f55aaccabd16a1e1f141032156d8b80e246ebb71013a2fe91e52003bb0a3c9ec74eb89078e31f419bdf9b36652385548426bcddb82aced4fe32baab08f22b
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index 5c70c80fbbea..9032aefde556 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A pure python RFC3339 validator"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz ->
 
 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/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 2c2ecb26b44c..4ffd19f2f65b 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 928 BLAKE2B 9eb06649a47976636baf1a5665fd91cd1539c6a27b9997b547bc52742eb73f2009f29c254c9803c21794d110a0ea929d37370c14c4b9b7c2e906339393eba15a SHA512 7b22a1c546cad668c5f705125d652ab2103937be30115d05ce9a56d0112c6db91521c52e46efb0d39bbf7772093284c98140a28b1f76dc84b364dbd86a324129
+EBUILD rfc3986-validator-0.1.1.ebuild 919 BLAKE2B d9d855517c51dfea8b75d6849682ec0d3e52f1463628cc401cc1578fde3250040dc54b7a865d2e6a2f82844e2f21cbeb73824422a20ed65051ee22d6d4c56f6f SHA512 3c05d4fe0584d438f8232e187658e566ad1548044062689e2b84fdd58114c7c7b0bb25e31467e70c5f290146cdd53b56ffa57438d5b92067b595e3a3f7411c7a
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index fb75fbde146d..e8f5dce4a832 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 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/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index baa0e87a5eef..8b1725e12868 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r1.ebuild 706 BLAKE2B c50d31a76a1489d06126169c94fe42781c4a45958710cf48dde6aee136aef122ee6421d0f7dc4a35607d0fbe197411d29183754111ed956b890849a81bb41ff9 SHA512 846b82268d41faaa6b05ebf10a08ba35200365f02b25d75d0bfc65f03abc62633f5a606133a75f0007d40266c314b2889b2ecc731ecd8a3ccae6e399a12d25da
+EBUILD rfc3987-1.3.8-r1.ebuild 663 BLAKE2B 26febfa435d075da3d85e7c182579f9d75424db572538e09c6b59da2118bc66f6a54e00fa00368944e26dfec3be4cb57a35a176eb0b2bcd14aa782d085796f79 SHA512 fe637a1c985ec586a65bdf0de7224d628a1f32be71e9a6818937496df0663db0addf769935ec35a6283ecad8d55a947bd803b770a03b13ca8a7d930576d3ac2d
 MISC metadata.xml 596 BLAKE2B b92d5182b2d55042b83fe9f1b02ec4b9964c760e8ef0a8a410a26846f2f82cbe84d0149ac155c55b0d58894aa9bda2505ab349369447eb278c66cd7a88be1c11 SHA512 10d16ba72a9ad425a9db2b2e19a589f446d093c527512896bcde00f56d4d39c8f6b94482a5a5a05b694df745b3e99b139bdd059e7ee033618aebae2ebae44b93
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 3d8b83a1bc10..2dc8f162d241 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 
 inherit distutils-r1
 
@@ -17,9 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 IUSE=""
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+DEPEND="${RDEPEND}"
 
 python_test() {
 	${EPYTHON} -m doctest -v "${S}/${PN}.py" || die
diff --git a/dev-python/riak-python-client/Manifest b/dev-python/riak-python-client/Manifest
deleted file mode 100644
index 4c5a1741e7e4..000000000000
--- a/dev-python/riak-python-client/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST riak-python-client-2.7.0.tar.gz 194141 BLAKE2B ae94f64ea71d253885053ea8207bc1b2a51433d2293f76bb172f5f85529c1d9196663ad3f760a58f3742158c8d0b32076c3aa32734e1bc228af22619662f54e9 SHA512 d63d031fb4b3598176480a3f1419158437ea814b46623a9a69e9105ced4172a1609d731bd163dd258c9301fa3b3c406a81f4c1068460b0ea397046fa6a1863e8
-EBUILD riak-python-client-2.7.0-r1.ebuild 908 BLAKE2B ff163dd0b2a6d80c3131fd01095df9e22748e0adb9cd787f534b00ec75704aeef83b52d8dfbf8a83e3a68478156f02e76db723cade525d50fd4808f1433acfc8 SHA512 b7ba5d833fbaa7726ba5c5b75e80e0e0f0d5f75a11f6010b7ba10e53ff5fa33e99d6be23c9cef11159b2b05995b3c22034851d7f1b8bb45b87b61a576f10a0be
-MISC metadata.xml 298 BLAKE2B 13c9618fd338dcfb4e2bc89bdae35ef10e22b3aea72cdd10d11567bef788eea625ad38cc07e6b1f9d0295cfcd85ce20d6409754aff0395ec6211d765db7c2a74 SHA512 f4802bce6379b65a8103f7ce238996334bc7cf066ead2a2e8903e00daf73f082c1ba446f0ecc5c2831c537af9e8848d9b60d9edb7f78de6e8e298c9e2e22d4e7
diff --git a/dev-python/riak-python-client/metadata.xml b/dev-python/riak-python-client/metadata.xml
deleted file mode 100644
index da754f1e4d64..000000000000
--- a/dev-python/riak-python-client/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">riak</remote-id>
-		<remote-id type="github">basho/riak-python-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/riak-python-client/riak-python-client-2.7.0-r1.ebuild b/dev-python/riak-python-client/riak-python-client-2.7.0-r1.ebuild
deleted file mode 100644
index 2cce65354e4f..000000000000
--- a/dev-python/riak-python-client/riak-python-client-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Riak client for Python."
-HOMEPAGE="https://github.com/basho/riak-python-client/"
-MY_PN=${PN%%-*}
-MY_P=${MY_PN}-${PV}
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/basho-erlastic[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-python/six-1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	# delete protobuf requirements that only work for pip
-	sed '17,22d' -i setup.py || die
-	sed -e "s:'\\\\n\\\\027:b\\0:" \
-		-e "s:serialized_pb=:\\0b:" \
-		-i riak/pb/*.py || die
-}
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index d1fd5cd4f71a..ef01aa343956 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,3 @@
 DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
-EBUILD routes-2.4.1-r1.ebuild 1419 BLAKE2B 3bbef4b2393780480a558ee52addf1c8c443dde874dbf435262e01eb919bead429bd28fb5259a33b7b75e8d1a66a4c07bb86908b2a5184fb18e04b8b7087c5a0 SHA512 799b7d88549d84d7672ffd1af69cc0a88dafe7871e269755109ea72254d8bae73456bb67f2b4e268ddb466a6811d46c11591d320e256cd0283b3102bcab05e15
+EBUILD routes-2.4.1-r1.ebuild 1435 BLAKE2B 84d71b3cb5f3596afcceb607028fb04c1aa64d291807ce0005cfeaea812ea4001745c8b03947ccb555a08c4b6f4a705f49ef22a0af555e17d85c844afa2e29fa SHA512 4f87ee90d60dccaf63102cf962891536361c964371e4a2e8542d38ac32d61e39443aa9ae6f03034dae1a308fc2015acef240476f1f1e57ea504437f8e4c6b0ce
 MISC metadata.xml 309 BLAKE2B 58e1b02098e87fe7303e9a6ce962897750493b957d3b30f78feb58b9cbec84b5fcf80acde66da35caa71989b628a75d232ea567e679f891fb4b81d1c49f61d06 SHA512 6daa7dcc2ae185c198c2630961d68c19498e98bce96ea3b1390a4c159fb591a89af796f2ac90e00994bda52c36138792797a38975c772d6fabce09cf0536722a
diff --git a/dev-python/routes/routes-2.4.1-r1.ebuild b/dev-python/routes/routes-2.4.1-r1.ebuild
index 301a043a306d..28b69fd9dca5 100644
--- a/dev-python/routes/routes-2.4.1-r1.ebuild
+++ b/dev-python/routes/routes-2.4.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index cd3ee2f4df1a..be3ea6d59d8c 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,5 +1,9 @@
+DIST python-rsa-version-4.1.gh.tar.gz 68748 BLAKE2B f7f80fab701e52db0949dae709a8ac01db773ecf721427536a4cc5a7dedae6285eab12b3377daa15e0ecf23682ba800fc8601149a98277331b1cc19573a94596 SHA512 93d80050d7c249285e8e05e2d9d84940b15f08380c3108da3463c1625fde18884189757e480ff62cc2b65d1521c57f8aee15aec501f3f1b9961ce053b304c25c
+DIST python-rsa-version-4.2.gh.tar.gz 63280 BLAKE2B 1260fe2a0f34c16b3cd2e18bc642da2e9c6caad851920a4c010aaad31959d0baab397356cd2437eb4a9091b3f524760f45b8d46ff9a207be009b2613615681c1 SHA512 a4df2de41d252a42627e96298b044a50953c429b5062f02cc7b64a7e17f75b09bb8b0f9b371353e639d1daec7775c20f20348f45baf00f591514c54e1315f044
 DIST rsa-3.4.2.tar.gz 40956 BLAKE2B 9a6353c84329303c655e7a25fcfa2ca42ea846c913fac0c26fee4a27bb85f9380de876b2ec07ae2212eb37efe5d2e401b2672f187f74bbeee1e9ef1099629e36 SHA512 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267
 DIST rsa-4.0.tar.gz 37385 BLAKE2B 2621ee732f15ea12283b723efb5e88847d3e030e8115bb4a3e986099fc94adc3409202d54b4350b0888deefd8dc801d8d3e57fef9e85f386ead53e4412da6d05 SHA512 e11106741cc4275246c986d39b3f028b5a4df6fbffdd08a78072ac3d3a9a7ade7a39789c504a2705f54d858a9bdbf03981251f32f9c45baba71e4a986e14b24e
 EBUILD rsa-3.4.2-r1.ebuild 726 BLAKE2B 1148a8eac8fff822edad880881c00287cb6b524f8de887803c2dd9e74170474d84c26294115d2ae5eb59ba6ba1c4a78eef00ed320ab4a0afe102344f1db1eeab SHA512 1cdb51bc1b094f54e9af7a2e598ac7d2a2865fd81352d6b614aa1a7864eafd52a2e7b5bdb747d6bb4d6d6e67ac27097eb61548563583db1e6eb6c7b1ac432fae
-EBUILD rsa-4.0.ebuild 573 BLAKE2B 32daa0425b5ebf056ea1343dd0e4e136ec854170d774166d8fc9c8ff2bcb06685c97f8abf151bd4a3671e605133e08881571d7d917dd69c1e511ab672b30f2bb SHA512 d6c3e2bd3783f74114fa1a6d342b9af33ef5182b4f55d6e0ca711301f07ee1969940f0819d5141acbd404e96db05bd8b8a2318f87a0df2b9d190a7f860113262
+EBUILD rsa-4.0.ebuild 572 BLAKE2B ec1267e4c5a6eb7afc9a43c6ebf15c0e48a5ded77a5a72c17255fc307c8e5f06e33c3f3ec215c7b21e5af2bebe3f451f6adc69a3a3dd4973da37873b2de412bc SHA512 04c0dc8141c7c73c59cb3aff94a6a7f64ed536c3aa07a8f25b14469586cc6727204344a296776a43bb8a315382bb3972aad0b1cd3caad6543ec93f5cc3f80fe5
+EBUILD rsa-4.1.ebuild 796 BLAKE2B ad8c9f68f5d44f5b212629b582a8f601268aba602af848e8ce5bff52f44c9bb1a7916843f9c4cec654e18eb343b27f405069c058b46d064449b129c784819357 SHA512 2c926e6b8d5e1d0ba325217d18bb86d8d8f2878750935e7aec3a4e74e6a3bf8f7a3108b0486e54710ceaff2e610e601ad9a1f5b70bde79c3762398fc241d9138
+EBUILD rsa-4.2.ebuild 754 BLAKE2B c656c6cb71c27707600d819536d96506d7f34b828163a9c7953d77725a2ae7e4fdbb0965240904713db00f20158ef51de3d637cb5d74eff6dea239870d8974a9 SHA512 bec13e16e645bddd9d0fafa4f09051c18ce348c6da87456bac9886f440accbf7a52067779b507850a374eb54a379567f92013d3afafebe1022db1fd648e52762
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-4.0.ebuild b/dev-python/rsa/rsa-4.0.ebuild
index 805415f593ed..10c836a9a58d 100644
--- a/dev-python/rsa/rsa-4.0.ebuild
+++ b/dev-python/rsa/rsa-4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/rsa/rsa-4.1.ebuild b/dev-python/rsa/rsa-4.1.ebuild
new file mode 100644
index 000000000000..0008a7fe97f4
--- /dev/null
+++ b/dev-python/rsa/rsa-4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+# TODO: +rdepend, when supported
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1
+
+MY_P=python-rsa-version-${PV}
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa/"
+SRC_URI="
+	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	rm tests/test_mypy.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/rsa/rsa-4.2.ebuild b/dev-python/rsa/rsa-4.2.ebuild
new file mode 100644
index 000000000000..482d5791c157
--- /dev/null
+++ b/dev-python/rsa/rsa-4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P=python-rsa-version-${PV}
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa/"
+SRC_URI="
+	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	rm tests/test_mypy.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 477683a30377..b76825d59b4f 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel.yaml.clib-0.2.0.tar.gz 178084 BLAKE2B a4d23e5c931a0c720edb80818ca11bfcc1638f28ec910878f53720139bd8fbd034de6db73154c0e758ceb6c5233c10a2bf7d779f8e7f4a134c8b07cc33382a1b SHA512 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
-EBUILD ruamel-yaml-clib-0.2.0.ebuild 685 BLAKE2B 0228fd5bd8772322e9d7f28a5aface3ca64f3d632560f024efde355d0d3f8acd6f3b90272cd1f7335b40b10edacc1b9486fba3111485da63a877bff960ea46dd SHA512 3c2eee4d96f689d6a8b1528ff5c29598367996314b0fbe9aa90176d5e157ff341a7f4295dd7c040d8dbc7c3bbf6ec0c403f4ca36dfb6e6fd8c07fbcd208a2f48
+EBUILD ruamel-yaml-clib-0.2.0.ebuild 684 BLAKE2B 475c5789650524b79e08d83dc48283664d048199fa1689519a1309cabd4c3728a720c65c691be441cc8b31097e760c2519c959a7134aed642403f34b924664ef SHA512 1d0e0c4401a086f7f69380334ddd92bc639fefdf2832087b42acd1db3f2db108b884eb53abfac9e9eaac899c92de363e544c3e8d06ef5caff5f145f4e09b0f8c
 MISC metadata.xml 925 BLAKE2B 9ed79b613e946d5f1fc006c818e1435e89b6eb74fd3f83d42fcb8cca906a52625a720616ceab67fc3a0cbed2197b52e7d3b106b2a7ee3d4f8fa8e837c856a2e8 SHA512 3ef363c45a12827551c44d4485373d50a1fabb27b20a6b97d014405ae7d5138916008bdf47af831b7ce74f58affdb5c7ff87ebff1336d2574cd897e8a3ce05a9
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
index 6e7e28b495ec..22323438628e 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index b1b4cb1c59b4..acde0b95709d 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
 EBUILD ruamel-yaml-0.15.35.ebuild 1109 BLAKE2B 1e949f71a37435a5e3e1f5919a3a0cf0a04b8b3b0cab7d7578aa9c6a65e21365b0e37998b531db98b7411c67b0058792c68bec7b43d3975236ac3ffd62335fd9 SHA512 4eb2233b1194f99b4a8a73f129402bfe2ac380b15582b99c0cb99010c3ad61d5b214ce1506589d2427757f9d3a817546d367e3820192203214eee1f33ff1de16
-EBUILD ruamel-yaml-0.16.10.ebuild 735 BLAKE2B 5abbb24ad47df2e134dc66346530a99f7051c8388e3af029eb4b30266a80ff258520aff789db12f0ea2087228bcb12957243d34c24cc172e8707fa30fc2cd33f SHA512 52a287e3851a9e25c0fcfbcc04c9ba6a48ce2ae326983a4ccadbf7e26db8825c0f3bb8d7443112005867f0c1cf0ef4815c754f6db3db806a173f0f5ea5eacbe3
+EBUILD ruamel-yaml-0.16.10.ebuild 734 BLAKE2B d0dec59ca2d23cefc374db11a6bdde42be73881e6df7ec29fec76ec9df8e38d7de4cc9d6c40822ed9b131443434c62ad1c3ab0435858824e9b4697dc69ce46f1 SHA512 9eab5692a9e5b2559ce2ae4a96941bc02c09b334b785b69bf7fd774b4454e5d33ac4cca479552478a4369a7177aa5ed1eb4c3ee3c8551f9801affeb0a35cff7d
 MISC metadata.xml 487 BLAKE2B 3e1f4ab68d168ce3e2136df34bd8576dd18d083e84a33936cfbf542474f0c28523da626a339fb8b1ee8796537c61b4c129445b6c42df79c3214fd1c356891a07 SHA512 ce5c8374b80cdb2c5548fd3c1ce3f9a121aa99ca589bb8869a53cc4f846dcd345b13480c85225aef5cda3fce349cf995bbdd4a46d709ea461a123d0813406169
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
index d330fc305f04..d16113c156a8 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index a607d5ae5437..0cb6b843cfa1 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,5 +1,8 @@
+AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
 DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
 DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408 SHA512 75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
+DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9 SHA512 e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754
 EBUILD s3transfer-0.2.0.ebuild 820 BLAKE2B e2a74d75a9ee0b875f86c7a9b509c10595bc1ea5465db832711e43a50b487afea933085fa07a88d20b213a091aa3b126e4f028c844c7f3c712e038a9dff71ef1 SHA512 0f7b59b068a027b6aeb9dff065bddb9fe1fb0ec4f9c004613291aa6ea8964e1dcc1a0cadcf1f55674e06f3d86ce74d4110d11682dd341723441b715830bca6d7
-EBUILD s3transfer-0.3.1.ebuild 938 BLAKE2B f3d9c3c9cb666e293bad93f1d61d97982503112c56577b29c06a8d3f3dd6fbdf5dc433180b6ee229a37864061693390610064aebe95de34eb4adc0a6c22cba2e SHA512 e57ea0aa7e8140c1a930a7ebdd728f6754244ebde8f21b56041cfe3d615e2bccd4e0ab39308bd542b807dae1759f50d7d5deed031a13d39d9f9d246f4983d43f
-MISC metadata.xml 377 BLAKE2B b67e151f23df1da87675bd70aa29b7793854028b49c2232a67e37272e1bfecacaa5fa58511af7b92ac9f9a0a4a2c991b3b62c0a5cbc88e01fc0ccc6a32a9583c SHA512 6f5b4c3fa2d4bce98c0177635b74eb1140b5bfdb0739d3b67bff431dc48e022dfa32dfa81c70bbe15080f5fca3c61fadc9c035d0aea9595ad9e125c7ea82c8a1
+EBUILD s3transfer-0.3.1.ebuild 922 BLAKE2B afa78438980a6bd51bd3bcc9966743185a46e9b4cf10614a6a57bc8fc6c6bffb3fadb37267ac5727b58391c31bb9f56a15157a07373278954270661884160791 SHA512 c49bd3aeb81dfbf12c14299e29a7b2afa8502592694b72a08fa712726b64d35739157aebc8e1b299a2222bb80a3eaf7f27719f538a6e051d650d3b31240eb5cc
+EBUILD s3transfer-0.3.3.ebuild 716 BLAKE2B 50de27aeab0e9251b793edaae04ed1e0cab3ef0c88f730b4e5b843b2e288f95c0149a645f20e7aa3fe2170e0fe8d71158322bfa4a3313d88911cf2d6952dab2c SHA512 11413cbab02052b563294a0f986cdbd72107273c379c00d215ed699a80536c5e0e7dda753812f75e89ed3fff866baf9c8d79e2ee40d5d399c3ba91ec49a5fae6
+MISC metadata.xml 478 BLAKE2B 8494fa51829bb778df3e7e93d1fccca86530c3577fe848f00b8f1c52dbfec8a56cbaaeedbdcd7db9eb5b542c8c2a73fbdceca9f46df3758b9f8636ee0fabedea SHA512 ba0e7c92da9cb77e61bfe7887fc97853f02379ebbffed62c08237bec954be080a64cc02e3d3e214b59c7a22e25c934fea3db5589c2f78462cce37186f63cea17
diff --git a/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch b/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch
new file mode 100644
index 000000000000..89f3d4b5ab32
--- /dev/null
+++ b/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch
@@ -0,0 +1,32 @@
+From f211b9851698d07cf218e78ebb39a337c8751df8 Mon Sep 17 00:00:00 2001
+From: Christopher Baines <mail@cbaines.net>
+Date: Sat, 2 May 2020 15:19:58 +0100
+Subject: [PATCH] Fix test_download_futures_fail_triggers_shutdown with Python
+ 3.8
+
+The behaviour of set_exception for futures changed in Python 3.8, it'll now
+raise concurrent.futures.InvalidStateError if the future is already done [1],
+which is the case in this test because set_result has already been called on
+the future.
+
+1: https://bugs.python.org/issue33238
+
+Fix the test by not using the future from SequentialExecutor, and instead
+creating a future which doesn't have a result.
+---
+ tests/unit/test_s3transfer.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/unit/test_s3transfer.py b/tests/unit/test_s3transfer.py
+index a87b4dd..4715be2 100644
+--- a/tests/unit/test_s3transfer.py
++++ b/tests/unit/test_s3transfer.py
+@@ -465,7 +465,7 @@ def __init__(self, max_workers):
+                 self.is_first = True
+ 
+             def submit(self, function):
+-                future = super(FailedDownloadParts, self).submit(function)
++                future = futures.Future()
+                 if self.is_first:
+                     # This is the download_parts_thread.
+                     future.set_exception(
diff --git a/dev-python/s3transfer/metadata.xml b/dev-python/s3transfer/metadata.xml
index 2feb8f78c532..c2621bab9aca 100644
--- a/dev-python/s3transfer/metadata.xml
+++ b/dev-python/s3transfer/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/s3transfer</remote-id>
 		<remote-id type="pypi">s3transfer</remote-id>
diff --git a/dev-python/s3transfer/s3transfer-0.3.1.ebuild b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
index 412287de37c5..18df49217ff7 100644
--- a/dev-python/s3transfer/s3transfer-0.3.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/s3transfer/s3transfer-0.3.3.ebuild b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
new file mode 100644
index 000000000000..843a42f09de1
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py38.patch
+)
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 396ca9ea98d8..87277784b036 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,5 +1,7 @@
 AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
 AUX scikit-build-0.10.0-skip-sandbox-violation-tests.patch 4606 BLAKE2B 4e563ca215d54ca0da6da812b0431c2f8e71fdb654ffbf0163a5063386a23b47b6ef6719aa95e0c59cc5a9014811d509b26edb716b4b96acf50c8180effd64af SHA512 e16339bb0f25938869f953ec06557c3c78158e0bb99a47cb2c72e6bcbb4aa638a923c4088f7596012b80769f398c0d6f14960793eef754cd2c404c5bfc289ad7
 DIST scikit-build-0.10.0.tar.gz 132443 BLAKE2B 7e817b1b6d8ea5e663cec59c5ed51b3f58318eedf6587380eb2a1458bac772a5a02a936015027f1200f740884ba33512babb1aadc4cdbb59ea38f46bc36cbb5f SHA512 cbdc59a41c60c162be84b38d207838d5e38898871f2ef02dcb672796f01f7a31645892770172e9891a4dd7aa02a85dd489b6dede4c5f717ab013dd8947d5d314
+DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
 EBUILD scikit-build-0.10.0.ebuild 1165 BLAKE2B 50ebd4a84506a5e7e6a10823c1c7a9bf94269be6d951a61c574576e1bb049b4abcd6c28dbe6f39c9d412f43d50d01846f5792cde1d904650d614ba2dd93d2e7c SHA512 75101db969a0005d48ac73a1b530192c82b038611f793c72d9a85f0ab27d5c8c885dab35fa47f57368ba4c5225d5bce77ddeadb14cfb5db2674292b0c695c1d7
-MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
+EBUILD scikit-build-0.11.1.ebuild 1440 BLAKE2B d74c225c42df37298d0d13fabfc3c2635c0472b705662d63311c368e683a9dff6729704212e5ade25c691eaf9aba02272eb208be937ab76b075019289986caea SHA512 06259b2703d87fa12a050bcaa2bf0634e63b601d554190d0e61f5a5bf98a6e8e7183f272cecfda2e27f664822f8a85933d235f934f99f899a528252ec9e88bcf
+MISC metadata.xml 333 BLAKE2B e446041c433ac52a0762f0f3624504f95a636bb297a41b098171b3b2d275f8d0214c60fbb0b86e6b892a4953de3bb9bee2f12504671dafd698529b724e4229aa SHA512 635413348c10790f6edb48236dedd4e5e90497b2654aeb3ce344666561d5de3107fb079652976ac54b579ede917aa965cd024ff3c113a5dc885d78fe9cfdaea5
diff --git a/dev-python/scikit-build/metadata.xml b/dev-python/scikit-build/metadata.xml
index ca93985fb0db..887a2a30e0ad 100644
--- a/dev-python/scikit-build/metadata.xml
+++ b/dev-python/scikit-build/metadata.xml
@@ -6,4 +6,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
new file mode 100644
index 000000000000..9fced16258ce
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="https://github.com/scikit-build/scikit-build"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]"
+
+DEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}/${PN}-0.10.0-docs.patch" )
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Skip tests causing sandbox violations
+	rm \
+		tests/test_hello_cpp.py \
+		tests/test_issue274_support_default_package_dir.py \
+		tests/test_issue274_support_one_package_without_package_dir.py \
+		tests/test_issue284_build_ext_inplace.py \
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py \
+		|| die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/scoop/Manifest b/dev-python/scoop/Manifest
deleted file mode 100644
index 3a5ee07fae88..000000000000
--- a/dev-python/scoop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scoop-0.7.0.release.tar.gz 598566 BLAKE2B fa3a9b29bf0182e3429a9e85df68c16d5e11b41a1f71f13e16a27372801f8827c13e418218b3afe43ab541a2bd815ef6d065508e3d022c118333ce1ae33e8e26 SHA512 4e8378b6c73ef7d3d2d6ad8387220e0659b12eed008d834fb99a661ff1ff5f6b842e897156cec41119f5c392e341c3e8e5b912f01f0728b585daab46aa07d270
-EBUILD scoop-0.7.0-r1.ebuild 557 BLAKE2B ec37484a01582b32ba1edc1510edf5d440837dfe79dc79d9e7e155e0daff97592fc9449e4156d7165e12fe59603fb67737a1d3719fa5f8a97aab1ab9884631dd SHA512 03235935c14f128b6fb78281c8fb9d41b76a6e0ffec0daaeddd599140c27b5e503e1382e82a372e564a392ba015fa199c60c3f596769d6646e07a4daa4ef071a
-MISC metadata.xml 481 BLAKE2B 66d497b25564dfae939f3d500db7fbd169548ab182a75166423cc872a62901844c2b1d534cc429fb0ad37f9507577241294b44a751cdfc6f7d38443ec7f287e4 SHA512 e8f0a3d71c047e2c63534dfbdc4838d862d06c87a68f9e303374361458bcdcdbe15b2e9708f952d7273435a1fc6b9581b8db396bfd84f3f527f90ea467c4384a
diff --git a/dev-python/scoop/metadata.xml b/dev-python/scoop/metadata.xml
deleted file mode 100644
index d584a0a62029..000000000000
--- a/dev-python/scoop/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
-    allowing concurrent parallel programming on various environments, from
-    heterogeneous grids to supercomputers.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">scoop</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/scoop/scoop-0.7.0-r1.ebuild b/dev-python/scoop/scoop-0.7.0-r1.ebuild
deleted file mode 100644
index e8bd3157042a..000000000000
--- a/dev-python/scoop/scoop-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Distributed Evolutionary Algorithms in Python"
-HOMEPAGE="https://code.google.com/p/scoop/ https://pypi.org/project/scoop/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.release.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/greenlet-0.3.4
-	>=dev-python/pyzmq-13.1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-S="${WORKDIR}/${P}.release"
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 334458767486..8c621f16fa8d 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0.ebuild 552 BLAKE2B d14095065d2fecc664e7912f3563f9e806cd1af530b505b9edb61b1162fda825cf6f02fc2d9793c4f54a59350126591ea4cb0010945e2243afafa784276f4b38 SHA512 d503ff89e44969e20b0ad91655070ef2d536f6a421b85785c308bb7fb2dcdd977ad73c8bff72d7d4a8572f981d18e0a6b5ba00facd8fb7b12de7eea98e97d94e
+EBUILD scripttest-1.3.0.ebuild 551 BLAKE2B d230c565de2254cd95900690043ca99c6f722cb9023b6b3e62d97d9d8ef3daaf6fe112cd58a9f37f2c2e826838023675eb2cf48603b7dbdf2aa3420e18803208 SHA512 8c442462d71d139e514a05bf87ae1bb26565ba368917156f7b7103243a0149c4f8a75135e4d7c8d2ad182fb5ca6e3e8ad9cddec925a9b30504c6f45aafbc7523
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index ced51f75881f..ccad3cfea21e 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 5cb55edf5430..54bb27fb0f27 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
 DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f
 EBUILD scrypt-0.8.13-r2.ebuild 608 BLAKE2B ca8ab15fa570948247c47e0d393cf148b959f940963ecfbf210f4fe71d6ef9074dea0cdf3bdedd2824094f6d4329da20900d156931ff8a0c54df79dc0e36aabf SHA512 397deaefcd0191a88d4c3a81a70a847490b50089ece03002e5bd49b82f7ae80f82ee6231d52f345c1e06e4443d34161374239066e15547360b9e9ecb8d60508d
-EBUILD scrypt-0.8.15.ebuild 597 BLAKE2B 016a13cc6e21713ff3e00af1a8f75dc52b9d81425cfab0f987273655ae9f5b05b1977f68a809532625e87c6718cf1dba3acbb5b9882937476c3055967d0a57a4 SHA512 d1a4769fdf0e42828fb326a8b065893927b4f1764e4428d3fc239faa4d27d1e4e315e84f0ac53363d88757c3c68554d10e07f24ff9fa7d72910ab128cd21ef36
+EBUILD scrypt-0.8.15.ebuild 608 BLAKE2B 2c0bcb42b4489a580781f45a7137ddad465c80335055bdf7a2a304a1fbfa8903a57b82608eff91b587f2428a8309d7e97bd5c13a0667909de4456ce469b06fbd SHA512 7bf524032a6a974e2ea05be229f522a0e4bcf2ca782beb2c0e2ec9293ebb3cf34766418ee3d594f78afd8aed8caac049162e5cf558913e63fca4996f89c63015
 MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.15.ebuild b/dev-python/scrypt/scrypt-0.8.15.ebuild
index fbfdea1d5f0e..3c8fb67edbd8 100644
--- a/dev-python/scrypt/scrypt-0.8.15.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.15.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
deleted file mode 100644
index c788db01b40a..000000000000
--- a/dev-python/sdnotify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
-EBUILD sdnotify-0.3.2.ebuild 516 BLAKE2B 76d4fc08e8c39f292cae48a2cfe3b40a5500074d2f8f9ce6008b148af18b7ae118f7ba3d6b1ddf8dd8d47fbdceb0b5a8bc7a255c581a9bc401919abf65d1722b SHA512 43cdb15b2251042995a99aaec8b5e03f99b36b6d74ea50500fcc4ca7beb2c24b7ed983ff63a79564d0a6b1699a0db4b05a4cfe2b36e37489c493bbd2658945c6
-MISC metadata.xml 800 BLAKE2B 3841a502690a98b0fd6ab419349f359dd167899f5c7b8f53e610a7677d060fba149338196a1108ef66bdf62fc42acaea6aee03169e6020d2eea1db83b54b6cff SHA512 2ad4766fb8ef7abcd0a5444aab298d97f66fd84d5dc6e24e6e597f075fc82273d7991e5186b08a2f1ff0040675a8066b3046f1761c4a8200a4894f66990c8a3e
diff --git a/dev-python/sdnotify/metadata.xml b/dev-python/sdnotify/metadata.xml
deleted file mode 100644
index 8627e65a80ee..000000000000
--- a/dev-python/sdnotify/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer>
-			<email>bbethke@gmail.com</email>
-			<name>Brett Bethke</name>
-		</maintainer>
-		<remote-id type="pypi">sdnotify</remote-id>
-		<remote-id type="github">bb4242/sdnotify</remote-id>
-	</upstream>
-	<longdescription>
-		This is a pure Python implementation of the systemd sd_notify 
-		protocol. This protocol can be used to inform systemd about 
-		service start-up completion, watchdog events, and other service 
-		status changes. Thus, this package can be used to write system 
-		services in Python that play nicely with systemd. sdnotify is 
-		compatible with both Python 2 and Python 3.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
deleted file mode 100644
index 87c06d0f9ffd..000000000000
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of systemd's service notification protocol (sd_notify)"
-HOMEPAGE="https://github.com/bb4242/sdnotify
-	https://pypi.org/project/sdnotify/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 4c5832da8b83..2a24243b3d57 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,6 +1,6 @@
 DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841aff86db21223ebdbf291afcc9ac7ee68de8c62e5929aa45aafabc791ac02ed80b6785e69f2d4b51d827fce8bbb3443 SHA512 295e0f75c772edf153480730dc20051f06e60e040a18f169620cb4aaa37b8c1a254a496464d3794a38cf49fa884a7b561fe364816f0d12a5b2622c77259f03cf
 DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
-EBUILD secretstorage-3.1.1-r1.ebuild 903 BLAKE2B 546b1d3c3acac3f012b8d3dd37d352248e22d22ba99bb7337dd31c2f5d13402d2ddd8ac52bc67e9f72f960d1b0af486ccb7d56da12efa4a2f29ff4027efce9d8 SHA512 398728c3bd906e7905211dc0b8eff7902947ebf123d971ebe6ee1dd9cb295f842571e72945f3873239fa705ab823e111c84d7f1c3b443218cefd4fa65553fb79
+EBUILD secretstorage-3.1.1-r1.ebuild 902 BLAKE2B c25c43653eb02e9263471876f07a14c4ac1c4cd8b63a5e1309f1fb17f633ab10a9ab126435ac022a4820b4fc9a95a7cdad89810f139c86e04c1857cc4b4c5738 SHA512 b091db11d231f939ff3c5f6f9350cb863f65d658ba1989c868dad3505eb804438a5c319c9dc4b64a7d4247ce33b17f9da22985d685f414f063404f34c1a59624
 EBUILD secretstorage-3.1.1.ebuild 1092 BLAKE2B 306a34a53d76d868ca010032bd6424158fa9775f7100e55eb2ec33acf53b3afebf76310c023eb55df64f4ab8b6a10495fad57a24ffb765496b3de7b4b9b1be72 SHA512 c123dd74c6f0ed3a29f6c0c165c4ca9a7a998de27ceae12cda2b14b7372c8be7aeb00933c2e5c96d8cacad04b85bbded7ffb1923af7849343669ed26a4473c95
-EBUILD secretstorage-3.1.2.ebuild 1122 BLAKE2B fcd7cfc87b1f84bf9a1ed29dadfba5d37e8b87bd8484662878e5316c646728b76ea5a2ca904c7156351fa58fc0d4ad71c4015735f6496162e2cb42a982662d87 SHA512 4824b731dace1b2649443cda2162e947a9d4b3a6f1beb85821707ff02be7d04f5175f74cf3492fcb5b01b2ef465cd72ec726d2378ba535daad758e05d29499b0
+EBUILD secretstorage-3.1.2.ebuild 1146 BLAKE2B 4c654901e897ec1f95783071c0f6c79c30d80e28773d44bd4c77b912804b021e23741ccc0fd3e7e4a0e4da79a0536637f8008b04e61c5d2cef1e66c78e63ed0b SHA512 93c1da70864ab15d70a226ea5fc973dd5b2cf3f6c323000b0978e0bed2a65abe2776e7c21405a85007c03fa7aba706b129306e83721ae395a1f86dfef9fe14ff
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild b/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
index 197304208575..c2c16164332f 100644
--- a/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index dcea3986b762..571eb1a98f0c 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index 299da0b7ece8..3ffe49c7844e 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,5 +1,6 @@
-DIST semver-2.9.0.tar.gz 24767 BLAKE2B 5fb9eda8c5ccc6b02997292eb6f7be0080480b21bc38bb629fa48af674ec7a356f2b9952459680281a187243acbde17968060c48e4c1af70d10f3bbdf984fbe2 SHA512 5ae9a4a66474fc82cf7e4612796a6c0e0280ad9969ff8c509e99cb266154f39a2c03c68f6167f8e17fda1ac16ce17a838e63d81bc2e78debfd07adbb7cbc098d
+AUX 2.10.1-getitem.patch 4231 BLAKE2B 1397f891e02fd92584d3448548c030e8abe1ae01842b826a1868ab00ff332aa6176979a1ffb01cca30a5d82501c884494828b20ca5f810f0780ebfb4ccbe03e7 SHA512 d3bf0e4404581c225c1ed26485f02cd005ec65f03dbcf3f5edc8cafc84f332a8c48f82e6d6375292f866d1d43420051eebcf949e08b40ab1a1ca04ed52550000
+DIST semver-2.10.1.tar.gz 39327 BLAKE2B 867edb0690b07ac460a3c43465047479a4dd84ceadf0eaebaad3c9975994efbf97d51d94c5de2ba6b758b5785649a20acbc2b24a31ab8114b611ac9a24f915c2 SHA512 6abd02f109836c956967ef60c882269818402b771d25a5f243628b6b651bcf9246bbf5b09fac746e65d8c54ffc7b42f21be6cb6dd20487b987a5976995bae51c
 DIST semver-2.9.1.tar.gz 32437 BLAKE2B f87f6ad001b2e3752c59282714d0dfc258aa8a727517b5b7caeeb9ff2ebc2fb5fce308a96e7728e2f79cbd502bcde5cddc3422563b1c0eb588e41acaba1178c6 SHA512 3de661921d51b19fd4922605677790b7e83ab1e34ef76cd9d6d2147753c122686a801b4ddb0fec1b85018e7c60859885cc27f43bc5e337de1b69b9304b398175
-EBUILD semver-2.9.0.ebuild 728 BLAKE2B 279d3a6383dbac3100c5497ef3eadfda49909841d06c567b21a5e537f55e493003e8e339232f6d0d8c26044717769d6fd12c8ef67d52029da7d9c94c8b6a1ce3 SHA512 7fb89a6223eef6be3b5c5217537b7117cb68d6d0bd35c58dae54e68599775a535a292a19f05ca527b39f7f43a5e5d3d97a4330deee12a38cd8437f2db74748c4
+EBUILD semver-2.10.1.ebuild 700 BLAKE2B 3f7a78674c297932f98a41e3e321f5674e2d08d786880d2b27a3332ff804a4035b38d475a90a2af50baf7f7e8200ff1199839c3aa488b0a1d287097adee88199 SHA512 ec89b7d7dce97e75c467c83b83c9bc00d8b205e08934bebbd7a12f37373bf42bbcd61dc92c11de36b4f3e7701b16b70dda9416c885d899e5299ba044a28d19d3
 EBUILD semver-2.9.1.ebuild 634 BLAKE2B df3071945288e833b5e0ca14226e7aa4cbe580673bb55ca2079387908345eb5304619dcc764ff8c34224fc5bef841029d660ab8b79a2cea31ce1867005f77bdf SHA512 c6cd63f6db0b23006379af516b2de00edb440edd13d6b5b90024f7bee2386e1ccd3d720d0be03ab6f90c6cf97eecdccb70de4ab71c74969d399aad994ca1eab4
 MISC metadata.xml 378 BLAKE2B c5a9b5c47963a1816ac261fb13f94438d4c3e55a7c7d1ef69ffac63ecd141e63b7b87d90dde26550d521615ea81f40e045ae0e61c9af111d10fbf89abb93284d SHA512 7622874a382b49f80d9565b77ea4c279e560e207c8b149b4b5f386f969c74e92f68b1687de306dc453231c36be3f6a1b9d526d175b555e17d00f467d86dbe41d
diff --git a/dev-python/semver/files/2.10.1-getitem.patch b/dev-python/semver/files/2.10.1-getitem.patch
new file mode 100644
index 000000000000..1a86ad0449d1
--- /dev/null
+++ b/dev-python/semver/files/2.10.1-getitem.patch
@@ -0,0 +1,147 @@
+From f332326e54a5582092b50c8fa113d11bbdf1a9e6 Mon Sep 17 00:00:00 2001
+From: Thomas Laferriere <t.laferriere@hotmail.ca>
+Date: Wed, 10 Jun 2020 01:44:11 -0400
+Subject: [PATCH] Fix #260 __getitem__ returning `None` on falsy parts
+
+* Fix #260 and add tests for these special cases
+* Fix IndexError not being thrown every time it should
+* Update CHANGELOG.rst
+
+Co-authored-by: Tom Schraitle <tomschr@users.noreply.github.com>
+---
+ CHANGELOG.rst  | 28 ++++++++++++++++++++++++++++
+ semver.py      |  9 ++++-----
+ test_semver.py | 35 ++++++++++++++++++++++++++++-------
+ 3 files changed, 60 insertions(+), 12 deletions(-)
+
+diff --git a/CHANGELOG.rst b/CHANGELOG.rst
+index c28880e..2671ef2 100644
+--- a/CHANGELOG.rst
++++ b/CHANGELOG.rst
+@@ -7,6 +7,34 @@ All notable changes to this code base will be documented in this file,
+ in every released version.
+ 
+ 
++Version 2.10.2 (WIP)
++====================
++
++:Released: 2020-xx-yy
++:Maintainer:
++
++Features
++--------
++
++n/a
++
++Bug Fixes
++---------
++
++:gh:`260` (:pr:`261`): Fixed ``__getitem__`` returning None on wrong parts
++
++
++Additions
++---------
++
++n/a
++
++Removals
++--------
++
++n/a
++
++
+ Version 2.10.1
+ ==============
+ 
+diff --git a/semver.py b/semver.py
+index 00338e8..0c98af9 100644
+--- a/semver.py
++++ b/semver.py
+@@ -548,17 +548,16 @@ def __getitem__(self, index):
+ 
+         if (
+             isinstance(index, slice)
+-            and (index.start is None or index.start < 0)
+-            and (index.stop is None or index.stop < 0)
++            and (index.start is not None and index.start < 0)
++            or (index.stop is not None and index.stop < 0)
+         ):
+             raise IndexError("Version index cannot be negative")
+ 
+-        # Could raise IndexError:
+-        part = tuple(filter(None, self.to_tuple()[index]))
++        part = tuple(filter(lambda p: p is not None, self.to_tuple()[index]))
+ 
+         if len(part) == 1:
+             part = part[0]
+-        if not part:
++        elif not part:
+             raise IndexError("Version part undefined")
+         return part
+ 
+diff --git a/test_semver.py b/test_semver.py
+index 8ecc81f..1fd87ee 100644
+--- a/test_semver.py
++++ b/test_semver.py
+@@ -774,6 +774,8 @@ def test_should_be_able_to_use_integers_as_prerelease_build():
+         ("1.2.3", 0, 1),
+         ("1.2.3", 1, 2),
+         ("1.2.3", 2, 3),
++        # Special cases
++        ("1.0.2", 1, 0),
+     ],
+ )
+ def test_version_info_should_be_accessed_with_index(version, index, expected):
+@@ -801,6 +803,7 @@ def test_version_info_should_be_accessed_with_index(version, index, expected):
+         ("1.2.3-rc.0+build.0", slice(0, 5, 2), (1, 3, "build.0")),
+         ("1.2.3-rc.0+build.0", slice(None, 5, 2), (1, 3, "build.0")),
+         ("1.2.3-rc.0+build.0", slice(5, 0, -2), ("build.0", 3)),
++        ("1.2.0-rc.0+build.0", slice(3), (1, 2, 0)),
+     ],
+ )
+ def test_version_info_should_be_accessed_with_slice_object(
+@@ -813,19 +816,37 @@ def test_version_info_should_be_accessed_with_slice_object(
+ @pytest.mark.parametrize(
+     "version, index",
+     [
+-        ("1.2.3-rc.0+build.0", -1),
+-        ("1.2.3-rc.0", -1),
+-        ("1.2.3-rc.0", 4),
+-        ("1.2.3", -1),
+         ("1.2.3", 3),
++        ("1.2.3", slice(3, 4)),
+         ("1.2.3", 4),
+-        ("1.2.3", 10),
+-        ("1.2.3", slice(-3)),
++        ("1.2.3", slice(4, 5)),
++        ("1.2.3", 5),
++        ("1.2.3", slice(5, 6)),
++        ("1.2.3-rc.0", 5),
++        ("1.2.3-rc.0", slice(5, 6)),
++        ("1.2.3-rc.0", 6),
++        ("1.2.3-rc.0", slice(6, 7)),
+     ],
+ )
+ def test_version_info_should_throw_index_error(version, index):
+     version_info = VersionInfo.parse(version)
+-    with pytest.raises(IndexError):
++    with pytest.raises(IndexError, match=r"Version part undefined"):
++        version_info[index]
++
++
++@pytest.mark.parametrize(
++    "version, index",
++    [
++        ("1.2.3", -1),
++        ("1.2.3", -2),
++        ("1.2.3", slice(-2, 2)),
++        ("1.2.3", slice(2, -2)),
++        ("1.2.3", slice(-2, -2)),
++    ],
++)
++def test_version_info_should_throw_index_error_when_negative_index(version, index):
++    version_info = VersionInfo.parse(version)
++    with pytest.raises(IndexError, match=r"Version index cannot be negative"):
+         version_info[index]
+ 
+ 
diff --git a/dev-python/semver/semver-2.10.1.ebuild b/dev-python/semver/semver-2.10.1.ebuild
new file mode 100644
index 000000000000..880b90a3488e
--- /dev/null
+++ b/dev-python/semver/semver-2.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for semantic versioning"
+HOMEPAGE="https://github.com/python-semver/python-semver"
+SRC_URI="https://github.com/python-${PN}/python-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/python-${P}"
+
+PATCHES=( "${FILESDIR}/${PV}-getitem.patch" )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# contains pytest/cov args we don't want
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/semver/semver-2.9.0.ebuild b/dev-python/semver/semver-2.9.0.ebuild
deleted file mode 100644
index 70195029b280..000000000000
--- a/dev-python/semver/semver-2.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for semantic versioning"
-HOMEPAGE="https://github.com/k-bx/python-semver"
-SRC_URI="https://github.com/k-bx/python-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
-"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/python-${P}"
-
-python_test() {
-	rm setup.cfg || die # contains incompatible pytest args
-	pytest -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 41d5cccd614d..f1a44cbb47c1 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,4 +1,4 @@
 AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
-EBUILD send2trash-1.5.0-r1.ebuild 674 BLAKE2B 65ceb0f021a0dd5e744e8ecff4df4d3928f33fb971bc1b677309eb23af77e859f5fc75031f21d9ed572b5695aab4980f82620ecaade6c6a9588225203969af9c SHA512 c66b1368507d8e9e53e4b39ae7d33b165e9e4dd9a1acdbe084da6bca03341fbc7f741bcbf44f88272ed130c0291ea8483de04d242dba933619cac98d75cf1501
+EBUILD send2trash-1.5.0-r1.ebuild 586 BLAKE2B 09bba5ee95ffeb9918ffceab697c14ac9ba87283606945169cfd384ea925a3bfa37f977d9bd6a353eb8ccbb2f8746ed193c951c6d7c0b266dd99a2f03986186b SHA512 85d51458b15fc61631df7693f660c3355d498696c128c4e2e08540d8170da3ab8af80c936e16b5bb1130b7a2a494437f4118bb98f831db9e81e2e68069e5d93e
 MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
diff --git a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
index bef2e775bec3..92f356cf9613 100644
--- a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
+++ b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -15,22 +15,14 @@ HOMEPAGE="
 	https://pypi.org/project/Send2Trash/
 	https://github.com/hsoft/send2trash"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+KEYWORDS="amd64 ~arm64 x86"
 
-S="${WORKDIR}"/${MY_P}
+distutils_enable_tests setup.py
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-broken-tests-on-py2.patch"
 )
-
-python_test() {
-	${EPYTHON} setup.py test
-}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 7e3388771863..882cd5b44b8c 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1,3 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
-EBUILD setproctitle-1.1.10-r1.ebuild 1249 BLAKE2B 2f5dff814468e7b253bc3d6873d24afc51537eb45be11b1215c552603a3087ed67b885c7b9f3082745f84a3e4241a11cb995f3582761e58d821930f04c25bc86 SHA512 d4b46c3d8e7af9889bc42636aa306e0425c2cd33396fbced068f5894c74e91e4409bf5d7b4ee37c1918edb0eaa4354a45ef1bd43483f2c92f6c228134ae4cbf3
+EBUILD setproctitle-1.1.10-r1.ebuild 910 BLAKE2B 2e06441c2007be29447c5383db16da1af3bc72a18a1b0e68261b6ce5faf6935b405179f08e9c68005417a1f774e0bc456060e32c86d860ab3c4e2e8457eb6866 SHA512 1ae15d308a04d36a06d201a221661d16a0b80497905a60f19df2d3a215f521430b7d04ad5612723a98d175b66b401d56293b1d50915266e1f33df5007ce82f88
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
index 0b893c76c410..a0662118eee3 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-# pypy doesn't get started in test run. Still required by www-servers/gunicorn
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -24,17 +23,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 # Required for re-write of test suite
 DISTUTILS_IN_SOURCE_BUILD=1
 
-python_compile_all() {
-	# Make a nice html file
-	rst2html.py README.rst > README.html
-	# The README.rst will be duplicated in src_install
-	rm README.rst || die
-}
-
 python_test() {
-	# The suite via the Makefile appears to not cater to pypy
-	[[ ${EPYTHON} =~ pypy ]] && return
-
 	# prepare embedded executable
 	emake \
 		CC="$(tc-getCC)" \
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 52fd8b09e098..e5893046b0a7 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,7 +4,7 @@ DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffcca
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-47.1.1.zip 870277 BLAKE2B 0ba55f2b51011d4f98a554a959227dba83a79e7369a3cd54450a1d18cb378bf7cfaffc1aa25b0ee11760e917d6f74891f0a63e43478893ca4327e0f5135267dc SHA512 053ffd4c26bf0cf1894754b1ed922be03c6fa2cb54a41e3d28a7d8f7a2fdf2ccebbca4e0bafa16eed476923ef70cf4294ed36df6e77603b2fae0a09b684132c4
 EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
-EBUILD setuptools-44.1.0.ebuild 2242 BLAKE2B 5d25046d9212067075ed3bd31d2821a24e459fa35ffb3178103907042cb354a11251de89c8a8ef161bc9f6d0a28963ab8ba75ae13d6385cee8483c6112aa814f SHA512 5f5daa3dd6f118d6654d3b0e1d7d3bffc1a47d14f1e2d7ab9dc4a78c1ee64fdab0c9bf6117e30850c5db5e325f9f0551baaa36a6ea9c512f9cfcf1306230d278
+EBUILD setuptools-44.1.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
 EBUILD setuptools-46.4.0-r1.ebuild 2296 BLAKE2B 48222d0fbae7bcad855839b6f2434047f7acbbd3e3192d0d5125b63d4ae5f14e31210e364770903f1d617f94baa543a7cc998b055777acc634707c75e4281b11 SHA512 5ba89846ef28a7972c0a9c38e9bcfa4d54ad959fbacf3340bf4f1283c14b00db3b7d89719aa4eb6447f0406e9fed3ed4e58f1cb7e994429dfe45279b10c6a78b
 EBUILD setuptools-47.1.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild
index cc2f0246b955..56fd5bdf49f2 100644
--- a/dev-python/setuptools/setuptools-44.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-44.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 2d96e38c0553..8c3b5cc07c09 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,7 +1,9 @@
 DIST setuptools_scm-3.5.0.tar.gz 46272 BLAKE2B 132711c8312dfbe48f9e2d3d7fcd0a86b057bbcf9a5f6b2e61afe018e116a4df96c3bf5cddf067bc92b96915f70182013749ce65b8fa5feb92ccef903859ee3f SHA512 f7e2cdae7a8a3d5ef3d12effcda5ce7f362c426e11aecaef69ef604bede9abbab2aa1eee6f5310cdd72a9bf11a927dbd1f42671e28bd467ad7b15f2dba5b81d9
 DIST setuptools_scm-4.1.0.tar.gz 48740 BLAKE2B 70c7530af963ad49c013f65a2279a76aa8f1ec6809fe463f95803011ecc6725cb18154f6c49f0a976e86a8c60cface13d1caecfa61a51acfa1775df291870e30 SHA512 96f8f3668f4efdb47f422ec33a417d8ad67697b953788757f7557ac3c8910425ff6f9438e2b724bbbd542da1f736dc1f5e02eb5305935d87bb9c4b943aff2f16
 DIST setuptools_scm-4.1.1.tar.gz 48784 BLAKE2B 3e9fe54ccd622ccb6fbc48edc0ad58fc32f8b81fbcb985c5308ac2cd6721544d16f704b0f8cc16393aaa9e034638fb8ee974f010a08bb37b5af936f48a6a4888 SHA512 acc44de4a5096adc34ecb67bbcfdaf7fd80954b1595c34a0cb8291ff5bb351a4e3dbbf26832f7f1973ddb834d8bf1caac5caf699eb1b864bf00aeff963bc3fca
+DIST setuptools_scm-4.1.2.tar.gz 48784 BLAKE2B 258fab119d3c37c17bd173e4ac34d338a222cee5f55f6b4756f2cb7feeb09e366f8578eead56caeeebc02d1b048199c0b560609e5aecacb23870398ae86f0cf7 SHA512 3d9d1e0479f00f6159b57f9e5b24e34df035d2009ec50d3779c77b1246aabc6d816f2a2d3e6651791316009e39dfcc8a1b84b779077c39501b9de5740abe6af6
 EBUILD setuptools_scm-3.5.0.ebuild 1116 BLAKE2B 9db6626cb3b863e3c124cc7a7e62cfbfeb0b2adf2467c1584503eff8af76d451f6ff68509cf222ac801bf2e35f68b61dde0b7f486f3d5d6cfd9564cdb835cf20 SHA512 de6c02fb68607524ec31fc9d053249cc8f5c05c010d64915cd219c07ef6932adf3ee809f3faffcd5300fcfd93b3db92747c793ac0c5cf541dbb6237967872662
 EBUILD setuptools_scm-4.1.0.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
 EBUILD setuptools_scm-4.1.1.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
+EBUILD setuptools_scm-4.1.2.ebuild 1137 BLAKE2B 2175d482de3491587d1d01effd26bc59beb236128c19227a704d3753baecbc600340d28e56449a85c4d52e0ad8a4d9b6283da4bad7b701de65ae98d3d796a53e SHA512 90439215b2972e888653ff4062425f03f30fdd765c312fa7c652d9fde88267571fb51aff7e189569277465268c09736a3e21378ada8e8cc3c8f7c89fab34674e
 MISC metadata.xml 462 BLAKE2B 257bda789df46f229831124349133582141ed8046ffe22a2ed2537562e583ca694f9a23ac8fb70a8a7efec1414530a5b16db73568dbec22cddbf791797a1c781 SHA512 1118b7d883678dd5cf0c80bbfe28a926172646369032aa54b634dc518d617754482ab35962a3647aaf88310c7abeb17842d4d98b431a7bea0d0780112d06993a
diff --git a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
new file mode 100644
index 000000000000..f28a4689c959
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial ) )"
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index be9359940427..454beed84f8e 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,5 +1,5 @@
 DIST setuptools_scm_git_archive-1.0.tar.gz 2553 BLAKE2B a5ed592384800585b3f58b40571edc929872908bcb5e2d012cefe34e6cd84ee420a3bbbb9e856ef0fbbb972931abb4913d245b98d54b82aaf659247b92a1303e SHA512 fd1a06c86d1a8394e37b91d374b93dd5902906795360688b49077a4530240fd6be575ee66d51c3f61931bc837711bc3c59491d7c9cd165c34e2ec1f314b4cfbc
 DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
 EBUILD setuptools_scm_git_archive-1.0.ebuild 720 BLAKE2B 1a32dbd31031a97c1f2e0b51a119f80f6ef0638e0ca3520532791a83db85e864cec2e6a189320f8002e0093ccf558bbd6d2c0c1c0ee58dafbdcc9a36549c2a9d SHA512 bcf408469284be620fcc044502e7d1264cc06398e03a983b757d2fa10a9787728b3f489af6e250b29a6d481b8a32e66891f231e7b3714e29f3477786f1e50c76
-EBUILD setuptools_scm_git_archive-1.1.ebuild 750 BLAKE2B 88218d65844c68f740d140776ca6122a95827f72e58268f17cf8215dde359853ce1b0c6aab19b2147d7047f8b937491f8385d6de9be761ede2cecc48cfd5552e SHA512 c57d26c97e21f02f0033b5e6e7ff630beaa58812d936bcb5e9a21d6b29b66dc2c54b5075e4b1f8cbeac8ba9fb2edee5342b59383bbe06ea78f9074634b3ffd31
+EBUILD setuptools_scm_git_archive-1.1.ebuild 755 BLAKE2B cc33b923713fb7176bbbb5a698d96d8a413fa8ffd7515eb15043787f1c2617c680348206f4d48e515ef9120a7f08ebe4cae551e289bd2955fac380b3f56ce0d8 SHA512 a7856edf5dbb1a4afe4378e087629e0937890e4d8a54c108c77d0655fc411c3038aeeba82e92ceebabf978cb7667d6345edf80883cbe98ad866dfc8cd3d1f1ba
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
index 94d423503545..e187d19e5ea0 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 0707397c3a7a..8e6e7e9234fa 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
 EBUILD sexpdata-0.0.3-r1.ebuild 529 BLAKE2B ca53444c59cfabd72d86dd5b454adb7251608f062872ec7879093d7300c667f67e2d6b7a2d032975f00898adbc643b2fef81c4de1213dc19ae49f7e70d068780 SHA512 650600a9fafb5949e6ffe35791feec2fe81c40eaf20cccba60f24f03ce868a62c2a10ba97656a45da0324c0455e8b0da46e5e6f42469b5239184ceacccae046b
-MISC metadata.xml 333 BLAKE2B a8a6362ebe4adb9e742728296d865bb30bf0b588ecb38c877c3f715e50c6723924b713be56c5fc33214c7e690cb53a39e8857ed57339be94806c9e06acb95e21 SHA512 defc606cbec597ad18762272f9aeb6e9fa1a37fb6068720373a638a9a58c415a2a13849c037509cf8411fb3ab2ee0cce45c743b780eac80d4c85ee4eaee717df
+MISC metadata.xml 329 BLAKE2B fbb2f8210e6dd71fac93c2b9c2a99f21a59141fd805276c3de543f969b7bacbf65c4bd239136bdc280fb5eb298aee160193c28a65e2cadacabadd90c8dde7b9d SHA512 98e7efd62fd98efa6fe6fc373d438b8f5132b68787f2b958319d3c7b07b589adb94136762ff950a49adb27d21a780b8cfca54afb1ff30a7c486381d9a7b87e6d
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
index 4c2e02398eb2..3dabd781b02c 100644
--- a/dev-python/sexpdata/metadata.xml
+++ b/dev-python/sexpdata/metadata.xml
@@ -5,7 +5,7 @@
 		<email>layman@gentoo.org</email>
 		<name>Gentoo Layman team</name>
 	</maintainer>
-  <upstream>
-    <remote-id type="github">tkf/sexpdata</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="github">tkf/sexpdata</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
new file mode 100644
index 000000000000..92315a5aef74
--- /dev/null
+++ b/dev-python/sgmllib3k/Manifest
@@ -0,0 +1,3 @@
+DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
+EBUILD sgmllib3k-1.0.0.ebuild 444 BLAKE2B e1234122587687c82c20128eca184dd7e29564bf0fd609090cb54ff1f644e6ab1210ed63fa24a21f17db0dcc8cbd1b58c0b22e4ae4d23cfa38fffaeb2e0bf022 SHA512 54a00a05f09fd23d3da2e1c06bdbde135a2ecba6b25de9308266f6d77f775d5764f640d1a855062c441aacf3515479d43871927fa00218a2e1eb94b7d5ff9515
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/utmp/metadata.xml b/dev-python/sgmllib3k/metadata.xml
index 53932d24b5ed..266e3f19ca59 100644
--- a/dev-python/utmp/metadata.xml
+++ b/dev-python/sgmllib3k/metadata.xml
@@ -3,9 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="pypi">utmp</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
new file mode 100644
index 000000000000..56060a4e95fd
--- /dev/null
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Py3k port of sgmllib"
+HOMEPAGE="https://pypi.org/project/sgmllib3k/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 64ed114f3f34..3e9f08829860 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,8 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
-DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
 DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
-EBUILD sip-4.19.19.ebuild 2379 BLAKE2B 60fdace1d0748349f2f8c101244dbfcbe598f7e61fb66c5c62eece8711200dd9b96c0b97c2c9467c7075f3abb97eb908da2bbabc2090a795754a1148b4e56ee9 SHA512 afbd248bbabd5c691fe4fe97f893007a3d726e849162f071f90e071007668962f02fb5b884253ebf78db9450396db90df4a3874ab04a728398494b8b4ba98988
-EBUILD sip-4.19.21.ebuild 2381 BLAKE2B bd4d65f9055ef1ea83131004d70f74cb9c69f25ec61fa189a6f1ae060add373ac622e9f360e6bbf7f40b0b4618338dfd2bc7cbe2b3a10aaeea637614c8183d39 SHA512 e9cc01b17d2a20b79df410f4c7f25e4d3febec56c201d4836f215ac032f5ebb905ebe7c0c17000d823f3726cc4dfa62617478edbaaf6ce9250a4c631fd4f5632
-EBUILD sip-4.19.22.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
+DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
+EBUILD sip-4.19.22.ebuild 2381 BLAKE2B 814fd23dd089d9e9abd815bf5305ca0d3c95acf9445304d6dc945f6ac916ef44c5f1fd7a7ff00f68e9a779b0a6a76af8920d621fff11a45f9984242b2c5fb47f SHA512 e230257d2a8d13f36946dc04a77f163c4e90ceadff7f320ffd05cdbe85049bf5e9f26c99139e21f6ee1bd748661a073554d0190d18513d6fd1613310a8b4a10a
+EBUILD sip-4.19.23.ebuild 2387 BLAKE2B 13c52156cf2cc477403fbbcb2c75998b6b67ef1ee4920110938c3c5917483ac9ee223ae646fb868795f01d62180326ba49f94e48a7a937287d7090f590af9d23 SHA512 049b482664ed679713f0f734f18a47eff2173f2894a41150b577c5fb7d8687d98b6000934ff357fe93d6788ecabe22e3ac1f365a484e333a81f82fe287c51f9b
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.19.ebuild b/dev-python/sip/sip-4.19.19.ebuild
deleted file mode 100644
index 5608137b7baf..000000000000
--- a/dev-python/sip/sip-4.19.19.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.22.ebuild b/dev-python/sip/sip-4.19.22.ebuild
index 320cc98ec4f1..6dfdf1956711 100644
--- a/dev-python/sip/sip-4.19.22.ebuild
+++ b/dev-python/sip/sip-4.19.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.21.ebuild b/dev-python/sip/sip-4.19.23.ebuild
index e15b6383ee87..1bb8cb20eabd 100644
--- a/dev-python/sip/sip-4.19.21.ebuild
+++ b/dev-python/sip/sip-4.19.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index ff066506cc05..cbf2bd3d90d1 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,5 +1,5 @@
 DIST smmap-3.0.2.tar.gz 22511 BLAKE2B 26aa528628d9f923b883481e635292c7eeba70d37c8258dd242a5ff875ec4627c57c753e4ce72de6d19ef7227540689b6c410d941079ef5c1b279c30f65e50a0 SHA512 52db538f16b9d0bdbbb932c7eb67510facd0638ea69dec21e9d503c3381195130ac0bc1f48db24ca76b8e31b07279799a767dd7e1bf1d755e7f7684f3285b8da
 DIST smmap-3.0.4.tar.gz 22459 BLAKE2B daccd2cfa4d448297d1a0b2c33c1a316e8c84ae5dbe934d688fbdf034a660214c98d428206b8e9ce1cab3e5f3561309a1e7f29e3371b7358954f0fe7ea37092d SHA512 da7e5c0257f29b487eb5ee18f29656340f7f6999dd625d93560444d526df8036a8fc4452242a2d01203907798709d82a0015709e097bc22acd3d0a8b976ef9fe
 EBUILD smmap-3.0.2.ebuild 465 BLAKE2B e298af1fdf3cecea7bb88d9dc57a6c053b3c292a36e68f314cbf27fb3a4d74a26ff8b36a8f05f42b18e2f75fd3e80356881a24d56692a1d16219cab6faf4bdf0 SHA512 7510bba2a28d9d1bf54bc09b2eb4a52532dfb6d2d9627e94cf9980e4b3ec0ca631dd6dafd368d62358b22ea04160ba49e3f4ddf6cf524d65e2adf8381db37bf4
-EBUILD smmap-3.0.4.ebuild 468 BLAKE2B 9e7fcb65a2635cb8eed99a8523eb474072d7e94ac5fc20343cc0e48fb4c17283589a5e5cb08f980ddcb3145d08f2e472d1729e579b7117e3553ed4176a75d97a SHA512 e5157e0aedf057cb6bca0ae336b70d7d637da63ac81b44c9679f14cbd4ef8e113b84031ecf001bf8626d61e8f4dfbff88ced5ca2da9ed988586cfc1c9f0cba8d
+EBUILD smmap-3.0.4.ebuild 467 BLAKE2B fbb4d7c7f7004dc6e7bea9ad9ccaf2c85824f88da61a5a6f947abadd6ffa6612291cba75cfda3bf54d231049c365acb51e11e8714aba8aa9dffdb32d702d3c1a SHA512 4e9045bb8ff5f83d023ddde1815f294e085703c6688eb6e687e31f0e2e34f7d3f7dc80bd7800d9e9f1b8215b6b8610eec771a0d5775ddce4939735d9cbdb06aa
 MISC metadata.xml 371 BLAKE2B 3e42cbd127ee25fe4e316797aed0977eab484119096a606b517fa8d57d2ecbeebd4c4b51570dbda7771d1b9bf6bca368b5fc97379f08e2c1ea51121628d109d1 SHA512 9f6f41b53acf58ff0b7ed064469b5b66820f6c173b657ce59d9501d78f87ff2667b84bd0be275f6aa2d06752d875c5aba83105f5414b2b50a86fce9008685f3c
diff --git a/dev-python/smmap/smmap-3.0.4.ebuild b/dev-python/smmap/smmap-3.0.4.ebuild
index 73277c500b93..90972aeedae0 100644
--- a/dev-python/smmap/smmap-3.0.4.ebuild
+++ b/dev-python/smmap/smmap-3.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 01f3107cfd3d..c65f4f4a2c9e 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
-EBUILD snowballstemmer-2.0.0.ebuild 546 BLAKE2B 00e435fde8ac1c2fe4879a8e7ecdab06414e313d74dcb5880f3421d0ac37bf3ac4a13d63c3267e8d2031e6361f48de0fc027646b4f8650e63fce6d95e228665c SHA512 829ebd6511fe797562591e31c761660d0f3e3df605f553066a7f7e3360bd4952b4d860120a01d3c537e9fd2d3b3dfc37d3cc3b77f05bdd6fa5752a30a3f2648c
+EBUILD snowballstemmer-2.0.0.ebuild 545 BLAKE2B 1e0055980f751bb439ded4f79cdf460cc21de8ae69dec2c7cbfb958012eb20b7d308e810c3326eb7754cfa87720f97ba6a3b7a187de68fcaeb9c7b2011c02f23 SHA512 743bcaa604a6bc29d25cd12830d3fc8c04d0160daa9f1ac77914eca791c370977a6a00dafaf334f9498e7a07e9257cca2e9a2261d66a354efdbca5c43242ad26
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
index 880f5b491b46..00ccfbaeb113 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index d5427e884a13..57b80994e6a7 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,5 +1,5 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
 EBUILD socketpool-0.5.3-r2.ebuild 1264 BLAKE2B df47285d2e83bc22500c18577d77997329eed569a6c5ac6d769599fe4343e666d27ea61a4433ac084fff5ab1ad37f81ae80c0c43686d2c91e4c50c33b6472cba SHA512 4b5fabf30d93ed2c1704881bad65d40806e98aa614d9b264c099a922747df64629164c4c818e0d5470b3a270cb82d85d095c5fa8dc926915cba79435170757e6
-EBUILD socketpool-0.5.3-r3.ebuild 1459 BLAKE2B 05aedc47e8f45aae2fac920759873461c69c715d6b63e952bb8b1eb2b36d4f999a1ff959c47635c53b6c007f7d8b9b1f88d2acb3020887faf23ae99c8d0765bf SHA512 b4cc7df0498317cb8b89cedddb74a9aa46cad0ef59b0366227165703a1626285f7103e36fc69b89b3d29628b319fbd54701bbc0c0b1b7d26e8a9e656a6b171dd
+EBUILD socketpool-0.5.3-r3.ebuild 1488 BLAKE2B 9f92eead8a705f3896520c24c26a3b9747b362f7225ef81860ae5f118307ebac1de48745ee6ecd18ffecef1988ebab3671a038d871c2583149be7f9fc0483118 SHA512 a6d9e284ddc1bfaf695a4d2dc5c44412baadb935cd93338ab9316c90c5ee9c1f34192958a78a8b819d6dcdc3ef078dd658b1cedbdbcac908db30ada1894f9181
 MISC metadata.xml 646 BLAKE2B 78d8d0ff3cf4c225a6f36e02c1ae604b2bc7274d2b3d1f5b13dba09e4111ffb1177cd9008b0841e1f22a5a77426dad7a6f7ff39b9475c7944e8becfaecc1499c SHA512 e0845d25b7c518c035e44094d6164d2184556e8e4c82691efb8c79401835a924ae3aebc271e29c756169bdcadd3a1b9db8fc8666aca65d79f5c10ae45848e1c7
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
index f37b627f196a..ec04b5041af9 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="eventlet examples gevent"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
@@ -30,14 +30,14 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-		!hppa? ( !ia64? (
+		!alpha? ( !hppa? ( !ia64? (
 			$(python_gen_cond_dep '
 				dev-python/eventlet[${PYTHON_USEDEP}]
 			' 'python3*')
 			$(python_gen_cond_dep '
 				dev-python/gevent[${PYTHON_USEDEP}]
 			' 'python*')
-		) )
+		) ) )
 	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 1fd08defe4c3..98641ab7c2f2 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,3 +1,7 @@
 DIST python-sortedcontainers-2.1.0.gh.tar.gz 9220860 BLAKE2B a667fa817f0b240b8af9758d5d3942710cfe6a39109c41e6e66d0dd464b300d2201a679335e418442aaa6e1953e38a43b46c2bd6ce631b7c168d6173ca36998e SHA512 1c56daea5d491dbeea9c677677a79ef5c4805325ea3d5da97005cd3b269003a99459550a793dfe65820f152c774371472ba471a7daf61c9d97b36744bafb013b
-EBUILD sortedcontainers-2.1.0.ebuild 821 BLAKE2B f295580d0081349cd6209d8a976db35cea585b32a98dddf4680e441b5d54454703986e11ffe4c9eb59b1e79a2c616e15b9b0548bad92eeae203a2b539663e1ed SHA512 d10f8c8d1ee7a24a50fb3a61400c1efe09d60fbfb918e11a75a4ef57defae2406062104320d22ad192fd723bd3f055b9131e4b1fef79da6594b6b9e4c9480235
+DIST python-sortedcontainers-2.2.1.gh.tar.gz 9228694 BLAKE2B ccbcaf8ef1582c3229cfd82699b642c9cd86db69f68cca56d35fab05fe6b8bef5281af53eae3b697b1a8d7aaad9140d2f3de611eeb5774319a64ff9c5fc602be SHA512 d4a45c4db9ec86c83c71506525a452fd5716818326635f69fb6e830d86803c5d39821678cb67e142ddd1ae9d093f9bb583c29b6bdc59a18a5ec0213eea4a1e29
+DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c89046069ed7ff075350d4a93f98521b48a72ba466719fd8b1eaa023f4c9d93beec1538315518f7fcc8b5b02478b1506c65fafa3840081b668 SHA512 413212aa35a80d24ec208caf19314dcc42dae207ec4ea8fdd7dc240c6fbf17372cb4c3e2209f6e40094419fa3eeb2fc9b23ad8bd7fb4e6fdaca46fd2fb248281
+EBUILD sortedcontainers-2.1.0.ebuild 826 BLAKE2B 795e8c35540f5d0edfb4cbcb6096ea5dcf5e100a51d18ce89762e47e1d75790759d88cc845fb54ef15e82b73e6a55556438b024d44f25bd371fb3c4f7395380b SHA512 bfc26051835b628a39496b1ef8e570dee729d6c20b68c5f4fa845f3ca025788d3ab30f2e7d59b59768f955d3aa074cbf9e94eb62ec18da97c12b9f69b257f9bb
+EBUILD sortedcontainers-2.2.1.ebuild 831 BLAKE2B 1b1040594f4c8d2d769ab92b618f8b1461100415afd968d9243cbed1f1eec90865af8a34b1befcb4e8feb9ce279914c09a2c354c7030f1c16a6e21306943cc81 SHA512 e609483ef63ede55654ac47fc83c4b1f7722da95961d5a4e457332489800477a56fcdcbaadafbe43e9f6479416f38a408adc55271a392d7707fd2dbc0a0ffe74
+EBUILD sortedcontainers-2.2.2.ebuild 831 BLAKE2B 1b1040594f4c8d2d769ab92b618f8b1461100415afd968d9243cbed1f1eec90865af8a34b1befcb4e8feb9ce279914c09a2c354c7030f1c16a6e21306943cc81 SHA512 e609483ef63ede55654ac47fc83c4b1f7722da95961d5a4e457332489800477a56fcdcbaadafbe43e9f6479416f38a408adc55271a392d7707fd2dbc0a0ffe74
 MISC metadata.xml 428 BLAKE2B a57e7ccaa33683eb26b7c30516ef267c10ff1b5057c8a5b2327228c1ba5e231cbdb137dffff389906947cfb7eed56f1a10a630634be2fbc91e20de4b84fe5c0b SHA512 71c37340680fda3bca57ae6c9930cb0e87c4f38c469964baf41e844302aaa25186509d556efdaf67c4750da50b2fdca8ed9dac2d9f287c6f83ccec4fa7f7aaa2
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
index 84a42db68ba9..a32b17db5076 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
new file mode 100644
index 000000000000..e70f737c3eb3
--- /dev/null
+++ b/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
+	https://pypi.org/project/sortedcontainers/
+	https://github.com/grantjenks/python-sortedcontainers/"
+SRC_URI="
+	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=.
+	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
new file mode 100644
index 000000000000..e70f737c3eb3
--- /dev/null
+++ b/dev-python/sortedcontainers/sortedcontainers-2.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
+	https://pypi.org/project/sortedcontainers/
+	https://github.com/grantjenks/python-sortedcontainers/"
+SRC_URI="
+	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=.
+	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 0c26e60e2b3e..a47f02edc0d9 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-theme-0.1.5.tar.gz 11132 BLAKE2B e405d3a3ccc0d8568ecc42f8891eebe405d2d75cd47e60910f59ebc979da07362d3cbc20833412a462454b2703aa945f491e85c10b206a356545a13cbc07984a SHA512 106a77665d907c45db1fc2c23990eab61cc70f9f373ce7fe0d231f9744efe5dc7119606bcbdf558ceb038edd7e0cb955531fd74c496923038bcfd799bf67616c
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
 EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 562 BLAKE2B 262862ad29b9f6f856ebe82522823d8a632deba86e5b00f88868e8db1685d113edfcde385a87d7aaea0f2c14c0345a105c47c5576e6e32b993e2aeac9d2632a3 SHA512 3084fed85d481ad806b828679af3ee7d736a3e6d94786005ba4e1bed5894eaf482d53a14e7f176c7b78a9132384d6bb8587d1a7db491170d4ab264a757e6c18a
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 566 BLAKE2B fd6bd10110660c04fb35786437c36f8629c286fd4d53f552a724bfb4026214dd0a7b783924413547e8a39e03edaf11107639aedaded16038e78ef79536c26a9d SHA512 66cadf3b06d101e1355177e0080458ddb5a8bb7e464dc3cafce2e951c1edf5e42d4e190e3abdee5e3cb24a2357be200b6f24676dfc9497e8ac9ce9abe6db7993
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 564 BLAKE2B d30c02f298b2018a3b58c99e6d1a53f7f5a575ae52bb20ad530c9a989a76470db91a284c0b3fd6f87974249616cac1f9239afde855315dd9a1ce978edaa0678c SHA512 4db4d0f7cdd222f171aed012b540bcade9545203a444a5954cf7c6d24f3e1f7291c68db358a82dfa9d2bdd3c64f7dfd807e2ae55a2fc25850a1b2b4989d61d66
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 6bd7f2baa375..79b697213802 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index d09980a4b841..340ed365eda0 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-gallery-0.3.1.tar.gz 88807 BLAKE2B 79218a1f438e2b8607c52b14f098c0136cb4d5ce15a12d82bdb3caf0c7c1090e7c4f210437fc660d8d4d19bf87bbaa2ec3c208d2dc8a77ad9deea5b5cefa3c05 SHA512 c51eaaef63a7496e223a4541d0560f694420b6ac4b2cde3779c405f0ab92d34aef7a37e4c41da9e59bd8a050c8d3eed330df3799e76a60ae35cdbc6f7c9cb8c1
-EBUILD sphinx-gallery-0.3.1-r1.ebuild 665 BLAKE2B cdcda55ded932f19cded76da9246a0b1b572ab3133b12ca3012ec487949ac8bebe55febeb6ce97f1b7f56d957111b79784058d4355f2e3c69f3f155e457846e6 SHA512 c409fbaa87c29136cbe45af39d32259c89023fb23279fdcff584bbebb51cd8f5a98953314b7b52032d9521637d3b676d6056d780a8754e1af34b0f174ea5ad47
+EBUILD sphinx-gallery-0.3.1-r1.ebuild 713 BLAKE2B e698e727864dfd0118b6847b76c756fea6cb21edab7a28941e082f466d7808d6d922e3d73699573067f9e23f71032305e3a935892701743eafa39f0e1db3ec88 SHA512 b581594ac4db20310940ddc069e044b30b75ace4e723f6df106fc97da0e63dde1c6c9d1fc34612e713b4024cb19f4f7420575a36641aa36cf5cacdfb10880c3f
 MISC metadata.xml 398 BLAKE2B 9ba3eb9dc8d9d9e16cb83963ab758bdcd11c6f7c8ff5ee6a9244b8c0e9c9db2162a22b855bdcd43148c0d23ef8c31c075e36bd4afdffa1a2eb5f30d08ce00747 SHA512 3b9762099b163b539d7de52602291433608ef33a9e60d3713e07bcf0b2b8345a52a0b162f6be52c9a88cfd419e5bc4e59307d07213f1d5aa3c4ca892d91f8b9b
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
index ad35f0273b49..b49e10f6b1c7 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
@@ -8,7 +8,9 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="http://sphinx-gallery.readthedocs.io/"
+HOMEPAGE="
+	https://sphinx-gallery.github.io/
+	https://github.com/sphinx-gallery/sphinx-gallery"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 4149b9daf3b7..6df9be4a88a8 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -3,9 +3,11 @@ DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.0.3.tar.gz 5905054 BLAKE2B 048e449603f171d72b24be5bc0fca3465819e78cc9e9e6c66e76457812a71fb2fbf85e7c2d4849541ab3a8980eb91b8f6948654c42d08e46c75c9841f5f840d3 SHA512 1e37224d04f0a7836a7132cea55c67b9d15a22f941a790288438b39d455973f254205ffd1e99e6e2305430725a6a623b9a85fb95b495a9f6f912fb94825fdcd0
 DIST Sphinx-3.0.4.tar.gz 5909229 BLAKE2B 892b435642be2a6334f93d9f230ec1aeeff8cf7b374570aae66eb341614d4318125920ef0c5593e7eee64e0b8781f035635af71aac34e9c2c6eb20a07ed68d48 SHA512 ec0c2487f098f774452b58d4fb67be7850b4a54b80f2b01dcee990298f59bfede3ca43b28fa992181cdceb07f261abce186862afd75c889c6682338049db6288
+DIST Sphinx-3.1.0.tar.gz 5931678 BLAKE2B 63f9d78ea46832fc9ca7122826888abb5b8a6be55e6b3e9015a34bc4186b0544a6c5429be010622fb4794b720a6675b3a89f101446e36327819d5db07dceaa03 SHA512 8660061f3617b00eaf19655256d1b164eb24cc10c7c8016e32cd28d1f81903ef8def0c5da202066c477448f4ac6d764dbd8b1b7179edcb9d00925e35596c4714
 EBUILD sphinx-1.7.5-r2.ebuild 3214 BLAKE2B 6cdc38d318aa3552077cd38f7b73511cd9348f4e227f828ffdb8dee700ccb3261be15bcf74306c098010b8f901507f7445c292741dad894cd94da95838444c27 SHA512 233f3487d87b8954edef1b141d21501fed815f50f129348094d5e1f7fb12833912f8e06c4eef508190a75c28f4afeb5dbf3a6af6f4caebb8cc0290134f043b01
 EBUILD sphinx-2.0.1-r1.ebuild 3448 BLAKE2B 4c5ccdb0c64bfdfaf758d462196746fbf3e3537148ff11d88e323297128cfa6643929465b9ee0874f744934e62aca5b22abf5029ab8435efb37578f5c949a861 SHA512 d68634bfeb6c5f1961d1e55eb7e463ab458a0fb155fcbdcd961386fcfbec789bcfa60611566f30a9d803cb3aeb5ae36d68101838f1e582c86cb54f2bd4573613
 EBUILD sphinx-2.4.4.ebuild 3647 BLAKE2B 827407c970ee827b569ab6f1bf7df1e39363c673e0b83c130869bae04a6a6f8d97dc1cbe18146b8127c4a9496812ea5505a7153047ceb753added94fd613913e SHA512 b699382de2e3c998ae1ffafb8093b4bbd523015011fd945aa4ec3568591703fc184ee689256e79d07beade29a9a4fd4173d58828abba0467088ad9eb94397e58
 EBUILD sphinx-3.0.3.ebuild 3996 BLAKE2B bac1a6c69c3d97dffd38981bb2def7434ca96dabd97852f9148943b1cb10da8b41764cd6e40aa625193c7eeb0dd4e77c849d859fbf0007129906d0a89fd9429c SHA512 59d3ab0cb1c9c0ed0f07ef3f4c70d528ae1da65ea258ad1b6702f68cf3bd9a1d94064386a48d8a36ad7349a8c6ffea5e8677a123c745f4795b69f4ffadb28299
-EBUILD sphinx-3.0.4.ebuild 3996 BLAKE2B bac1a6c69c3d97dffd38981bb2def7434ca96dabd97852f9148943b1cb10da8b41764cd6e40aa625193c7eeb0dd4e77c849d859fbf0007129906d0a89fd9429c SHA512 59d3ab0cb1c9c0ed0f07ef3f4c70d528ae1da65ea258ad1b6702f68cf3bd9a1d94064386a48d8a36ad7349a8c6ffea5e8677a123c745f4795b69f4ffadb28299
+EBUILD sphinx-3.0.4.ebuild 3956 BLAKE2B 7aeab5ed471682f09b43ee43c87c7b8e2db526a1a54a8fc77d3923f4a5938ad6638150c49c3da0baeaf40ca3974d5ab770d5c1672fd43e4797ae50f41f164c99 SHA512 dd508c5a3993f8d6a4ec9b88f834340bc7f385040fc814417e7af50d2ac676328a694a35c233f1c3868a255b4140a62dee981a0181d3995be87140c9b81c4f86
+EBUILD sphinx-3.1.0.ebuild 4775 BLAKE2B 29587fdcea2941967b086fcaef708e74c599c216a45df08cd33fa3fc87912f8b129806c1bfe07db450d2d99864fa78ce9d315a063b1a5db8f61db19bb7f49339 SHA512 f77036ecaad0798063ae2853394a639d53d7b238978cf878ebf0daa1764b8342964a96f1332e9bd0816b2369376ee9b1d1bd282936d17235631250455583d13c
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-3.0.4.ebuild b/dev-python/sphinx/sphinx-3.0.4.ebuild
index 3154c9ce95ac..44f026f88657 100644
--- a/dev-python/sphinx/sphinx-3.0.4.ebuild
+++ b/dev-python/sphinx/sphinx-3.0.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
@@ -44,13 +44,13 @@ RDEPEND="
 		dev-texlive/texlive-luatex
 		app-text/dvipng
 	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	doc? (
 		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 		media-gfx/graphviz
 	)
 	test? (
+		${RDEPEND}
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		virtual/imagemagick-tools[jpeg,png,svg]
diff --git a/dev-python/sphinx/sphinx-3.1.0.ebuild b/dev-python/sphinx/sphinx-3.1.0.ebuild
new file mode 100644
index 000000000000..02e54fb7e8fd
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.1.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		${RDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
+
+	# fail under pypy3 (some because of missing typed-ast)
+	# revisit when pypy3 becomes pypy3.8
+	sed -i -e '/def test_partialfunction/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_typed_instance_variables/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_inherited_members_None/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_cython/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_automethod_for_builtin/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc.py || die
+	sed -i -e '/import pytest/aimport sys' \
+		-e '/def test_builtin_function/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_methoddescriptor/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_wrapped_function/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_autofunction.py || die
+	sed -i -e '/import pytest/aimport sys' \
+		-e '/def test_autodoc_typehints_signature/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_configs.py || die
+	sed -i -e '/import pytest/aimport sys' \
+		-e '/def test_autosummary_generate_content_for_module/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autosummary.py || die
+	sed -i -e '/def test_annotated_assignment_py36/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_pycode_parser.py || die
+
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index 8c54303b89a5..9784c6efb8f7 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-applehelp-1.0.1.tar.gz 22086 BLAKE2B 6e10329a1712cfcb1f29a3b4c23be5169507398a43f800623f2b24fd350f7e2ad16a887e87a3b68253dc348337342d3d4397d3a9d81a460c389a77ed4bdc973f SHA512 a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603
 DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
 EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 723 BLAKE2B c1536cd89bfa2cb95753667073bb8f5b754e92df4355064dddb8d022ab3b7064f0ff7bdebc58a536907cbfa54c72e87aaf0ba7e01b4f1673a6b53cbe01bbf5d6 SHA512 314cf487afb93e7c65c64ab037ad709e2c4649663b2a9b66e584ffb937e5de171242d59c821629bb03b1c5682351fa04226790b7af6d5a0d67bb6f7fdac1940f
-EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 884 BLAKE2B 2fcf031e4b20611425db59bf087dabb91b4886bb4f0c4b7bea235e35d9a8bdeeb0e27d762f0217cf81219b0fae452245d04c7c1425693f073620e1f0930a31be SHA512 f33de92855bd44a3cf03e3bd6b183890d59a63988e15d76e5bb5eb5a3115282c3251af5ffca887abff1f183b81f8bfa33b15ed59f479e6fd2ec12f5afaf8aa26
+EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 843 BLAKE2B 4769c8e43b1721fbc4cc5b73348595f2936cd0d12bed591b54564cea51de0cdb0a08a13f9e6b0940b297f08199c9eb634f27373cfff31c23c90bfc2fe64ac1a4 SHA512 60628f107b7149d02da9e377b41bd227448b3eb69692426a0bdf32551eb3cc4de2ca0737bebad92f5a430b35431fd015515a43b5c9fff73c7d9d0c5a80f553d5
 MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
index bf40c504db03..0a2d64fa09a7 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,8 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x8
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( ${PDEPEND} )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 106aab85799d..311745b5799e 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1035 BLAKE2B 188ee3a39779d467ef9dca1976bcce685114a21297bda8404221dce3bf1ad34bd78eaa967b5f29c3a2fc9764c7da0051b9f39944000fa60f76fa3cba773558db SHA512 4db8953a811b74902f35334d7b3bd4de9d47be76bc233909626c1021018c0b8abbfb9b33bc2407286de7fce9b16c0ba5ecc7a7c422f85141300ec954d0353f91
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1042 BLAKE2B c56674de86f2e25efd4ae6e46414eee774b2da97cc03a3212b844f43359c861e773aea93199b8ed21aeac122a25a6b0053318f79cc4821015d33c584048ebe4c SHA512 9b9320ef9e43c31c2bf63c244752568bd945f89747150e1a8b4ebcbf5e670687e85052bb207af5e3f85c412f0b81f5d1204c90733490a45a2e6b772a8a539e6f
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index a688bfaa4165..9b2eff38c130 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 262070a4e389..0ff33b0572a4 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-devhelp-1.0.1.tar.gz 14016 BLAKE2B 4b8c079773d65f5fb752870dc728d8e90e03fdd2f8a4b01324838928ef2deaf2c724c0b149697a61624ea7382445e81fe261ec2b726fa3cfb5547bd053286e4e SHA512 135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984
 DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
 EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 725 BLAKE2B 4d337beaa20392e1f910efa4f884720c260a6fe7783f8871444e83ae4710f09bd0aecc19356dbf79463ac721e42a3a2dc50bbb8074d02bd1fef79c75d95fa2f4 SHA512 7110597554f766f1a2ae3e15f9ac627aa9ce8017f5a6d5ec3427c055e24c757fcda89594f4ee886a83c98a015fbad9137dc1094bbc5f4bd10251aa1ca81b9611
-EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 884 BLAKE2B 7cfb0cfa33a0d41d4ee0204ea5cb2396c63db4e524f3cb20dd0b0a90d726dec390960dc4638dfff0b1175ba17cfea2938692f4b2cc725e7e7e99c6da6beeca45 SHA512 44cf2cfe28bb5a66d41e9add7041803c002556bce23bd32a9aaaf7007dc7e03cb0a497624f7739daa9c22e218a986f8023362f5e6fd1a22aa5e474aa07997119
+EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 843 BLAKE2B 4afee752764f0a787b399732c4c39fd727d02ec490fd4c9013582528d3a9878a09519a298abe41bf4d3f494a0d59645e019c1feaef2783ee4877105ce8d5d7b9 SHA512 851122a62035547148ce610f479aafeb46106bc5c18044479277b8ee4ab1e6baa39d0ea1074844f93a1dac50fd06b5133fd082b43b3c994471d2ac57beb50360
 MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
index 918979ba97fa..873571929afb 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,8 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x8
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( ${PDEPEND} )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index a610f23bfe1d..de4fe678f158 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,6 +1,6 @@
 AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
 AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 635 BLAKE2B bacd01f65b4cd74b26ec89a3b3aee9d6d54fb4b5fd607d0a46c21064f7b6dec2823e83d55435c7117d660274ab0b3a22d824634ff98b65b614f73ffa8f89214f SHA512 3db5b81b523d4078c52250d2db8ab3ac4da648f391ce70be2baf1b66a28f0c5ca42769a762ba5a74971b8f87521aec08470964bbee735814e8efa24fdf7f36bc
+EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 640 BLAKE2B 7da032195c19cda1ea14dc0b97a61ff4b1be5a9163d5f383f55ac677983e19b79b66a01588c685151f149f095867da857fb1b4668f1413895021203079d51305 SHA512 195f73a7df7c81e115a39f320d98382442498e3a11c1cb58c0916970e4db6803b1cf535d554d6f95653e594211fbf75a9c8936f34ee60c9443f0bfb6f77e8bc0
 EBUILD sphinxcontrib-github-alt-1.1.ebuild 873 BLAKE2B aec3c67977947b4ac0aeb7ad3c5306bd10a294bc28dd9c822b4efa2cc411c51d6d7fc5a2ede3feffb7dbe6d4a02bdfcdf0dc965e2540c02d048009d033518f08 SHA512 80656dd0b99a89e07eeed24c3ea0d67e215c174d69d741f71e1b45799ea74cdb1e1a2bc8e898c54bbd866326c8d06f71ef17613faa2e1515ed3596162489df8f
 MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
index 71120879c024..1d814e6db085 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND=${RDEPEND}
diff --git a/dev-python/sphinxcontrib-googleanalytics/Manifest b/dev-python/sphinxcontrib-googleanalytics/Manifest
deleted file mode 100644
index b305a8377516..000000000000
--- a/dev-python/sphinxcontrib-googleanalytics/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX setup.py.utf-8.patch 413 BLAKE2B 831b51cc5c0509a26fce8d078da208849936260bea42976642b943cd99974e2479281bb67d29ef234fae3cd96689c17be19ab3e03131b86a122b5fb17d5b1f6d SHA512 dcf01e5d306cf41c5092328de26d0d83d183c9a969898ae42e19025c45f8412f9c1bdc18ba7b247e10ac5d33e77b5211eac7fe4d36c69603ec6c6526f61a90d8
-DIST sphinxcontrib-googleanalytics-0.1.tar.gz 2892 BLAKE2B 22cd2ef55a619bd4a249c3d33a4c0d8a27d038c434f5f1668854cb494f134354cf654abd187da71e3aec10c7f0d422bc3abc310c8208a12a85848a5ef5cfa97f SHA512 fdec9108f9c1d86c6c59cd2bcfa55d82cd5cd48aca5b7aecec7734f3cd29b0f6c080aad7b7009148e3d95b7cf80af38ffb6ba230879495f3c1488ddb661fbf48
-EBUILD sphinxcontrib-googleanalytics-0.1-r2.ebuild 707 BLAKE2B bca9e9bc2cd44bd5e23904e6bdebc745231f6a1995f7ed2e9cf4b29a16db64f3a599f58e0910cbf666d515d4e6afc8b9e968862e838f8a7401896fb5777448cc SHA512 342eb7871f38a04517d7650acb67cc6578ce9fcf24ff488abfc8fa8c7f731629109c7f9d0dc056ea71bd5175c634179fab2a6d8e1736378af50d968b6f83732b
-MISC metadata.xml 412 BLAKE2B adf7b6eaeebfecb34c4ca1facc156904cf70a26070b8203e159d715b3da57083a1358e424072bc84f24930d047ed887a105be26b13fa26b1a3e4ab3446e96dfd SHA512 46c62c4de72309bf938f9d91b89183968e51741b4ce25646c359de043ff463fa6690b4f91484388007b96fcff64b0c293907bc07ffe6160d29cb68c391b15afa
diff --git a/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch b/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch
deleted file mode 100644
index a45ae42b188a..000000000000
--- a/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=429914
---- a/setup.py
-+++ b/setup.py
-@@ -1,10 +1,11 @@
- # -*- coding: utf-8 -*-
- 
-+import codecs
- import os
- from setuptools import setup, find_packages
- 
- HERE = os.path.dirname(os.path.abspath(__file__))
--long_desc = open(os.path.join(HERE, 'README')).read()
-+long_desc = codecs.open(os.path.join(HERE, 'README'), encoding='utf-8').read()
- 
- requires = ['Sphinx>=0.6']
- 
diff --git a/dev-python/sphinxcontrib-googleanalytics/metadata.xml b/dev-python/sphinxcontrib-googleanalytics/metadata.xml
deleted file mode 100644
index 59d4f18d4f76..000000000000
--- a/dev-python/sphinxcontrib-googleanalytics/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-  <upstream>
-    <remote-id type="pypi">sphinxcontrib-googleanalytics</remote-id>
-    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild
deleted file mode 100644
index 8e3ec3cf453e..000000000000
--- a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension googleanalytics"
-HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/setup.py.utf-8.patch" )
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 9d74821f7e13..f6097b03a8a9 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-htmlhelp-1.0.2.tar.gz 25417 BLAKE2B f5f13cebf0bdeb8065fa37b12d90dcb4cf4775377b2290517105bfdcfcd7a168d10b0c84a90cdcbefa95f0d40b6bb644532e75b5616562cc37c04e103ee7bc4b SHA512 2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de
 DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
 EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 722 BLAKE2B 417317b490ea6656a7cabfb707c7bc6ac552e3c4da9b305109ad3bb773d804f01836cb0ffc38d887e8c4cec4d10db3cb038e626a59181b15d1e1bb71b7997d84 SHA512 d64fbb0a38791b94ce9ba6a284c50ce6a36291f598c5aaf30e94b62874dee4b7763c584e3c9542e058443a26a358cd1b3ca1aab7118f8de6b601ad0ef31a3836
-EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 885 BLAKE2B 24c460c6f118e7247baa3adcab99bcb133a6b2201077c0eaccecd445f6cdd89e99049754ab2e5e93ca0d3f12544fbf107e11dfd571abd4ce5511fc30552a6561 SHA512 1a2501b0b689976a1300d71473063b3c71e250d0d6513f77f966c3cc6fb482c96da406c7ddbca368c1baabdffe09f4a7affe1f422db06756c8173b2b5331ed0a
+EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 884 BLAKE2B 268b942029557887abcd59d7a7a11b7eb44981fa868e47c12c36303f28689f3ae59e965efd2b7705ad38dec5929d0242adaa5c3815fa8baa23bb4d1182c35d3c SHA512 091cc78ba8a363ca4c85235081e0c8390cc20e58bdd90889df89208e2ee204e078f52b58f474d204b8b48cf9ba468f533051a29c4f5df19c54ab0269348b9117
 MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
index e987c32773e3..362a4601fc64 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 180268b28d42..b94e6443ba71 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,4 +1,4 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 901 BLAKE2B 072e95f47a0b6557efc43041aae190cf4c563b20f23d9ddf261b0176a54c1ff07a5b6cd2d87255fe5edc5215a070e58548f9787d27a296d74a1c745dc6db79b1 SHA512 4a4295f8fd79dccfcbd9fc85c16f6d91b8e2da2cab72fd2f7093c69d001f209209f2c1c4f8bdd1d6d500b72a9967429eac7f6df969e232a08cbf8de596027650
+EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 860 BLAKE2B e03373aa94cf707b686796a7b831622130259220ac84767dded95a742229f5a789f6efdbcc195bca3c624b2eeb41e4545d9c66a7f915feacd7f8964463608e70 SHA512 96a968650c67296d1353deb3f086bed3997663d3f118205fb4ff48e1532dbe4c4635854510c495246cc2f087a572bec80dbc8e9884f447dc2448443cc59b6b86
 EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 743 BLAKE2B 130b57fcfc45f3905743c28bede65e68c69a77fc24f26bbe6761a050f2869271f2d1c9c1d07de66d2642d04dad0561b81b3aeb978aed2adc7c3faf0e08c778aa SHA512 7cbbb84b6b037896219da0a3ebccc0af280d1e08975d1ebe88fa509444b0d99812cc0d5800459b4efe1d4661320bd4ba1447c1aae5aa9f1bbe99713571ccf531
 MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
index 9ed312b7bcfa..97538f025fd1 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,8 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x8
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( ${PDEPEND} )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index ac1118f51bda..164ff77fcb73 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-qthelp-1.0.2.tar.gz 17804 BLAKE2B f3d6a67469c82e2a6e90b75d506ee3faa896d8ec408d60f93f74c8cc4bafb22772f85e36c286a96cecf2d7808338da233910055404969ef311f935173f06f376 SHA512 8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864
 DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
 EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 724 BLAKE2B 9da64c605ff4edd21e5c3b457d6a651a7a1ebd3f72eeac8fa9a1319f0f5f6fff1a78c239175f5bca98e4761df31de38a536416a2cd45457b7d429728e036a70d SHA512 8ff3a400950af9e50c63a8f521bc10965f7acc7606a78994b8946266a24ea77bd8541e7fc81a05d92ee3485fd7cc3ae1eba2e2cefabd0a9dff8ed43e6ac7f840
-EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 882 BLAKE2B e1ce76bf54a31c6bc83fbd12dec5bd234305b1c481cde3fb17b7c2c31e9d686c3f6325bc46a0e02478a30e711306e8f6e1e2446dfa904b8bfe963455265f75e0 SHA512 5c62f291b3769fd07c946ee6e0d0097866a31985e1b8c6195677161b6b1204a33c8b10b09c33e65386a6dc747cad890b4c23b5e8445b03e1c67d0ac13d5cb03f
+EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 841 BLAKE2B 4b5a16e50f7148e6e43425326d4ae11e0376c59ae643d264c659739d7802a7abe51c6b1a6d98605b00d4c48b4b5432c26f3cc3fc6e6fb3bf2655dd348f2547e3 SHA512 4db33388feb73122d5a842595bfe7b2984caaf04bfe51991fa58a0cdd2c909f8df9cae0d20c978d40ba0e0e7cba0f052ed3df75c701703e528a9be004b008194
 MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
index 53dfdd4ef73b..185b85b3f675 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,8 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x8
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( ${PDEPEND} )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 55f068e24924..24e1a43ab82b 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-serializinghtml-1.1.3.tar.gz 15799 BLAKE2B 92771e87c61658cadfd6c1b07b7537ddd26866b94efed26af968e92929ddda5ada37cfbebd06a3ac14854a3831715ff67cd6f5401c317bbfbd5bf2d014d7356d SHA512 984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55
 DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
 EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 737 BLAKE2B 981338f2cd412753974a98b2ee7f8da962c8225354ce1127093d3e3e9f6e571e03355bf449c232f07d4f4c2949d8f157f78d3cfce0d0dd1f78cdcba68689a73b SHA512 3ae289009dbc0f4eca5f9e58935d3cbb1e7f14ad58e775a7c7bf30795788b3bf8b735b225afe67035f433f0cb99032a9543484c246f7f4c9c2096e7b8cbdf8b6
-EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 912 BLAKE2B 7d0795a2b7ac4d27af403471ac08319a3a311b50c3b830b0d3954935bf48d5ea0288bd7692a4cfb0bae51543c384233486c79950f6e088217d7c8e1918c76ae7 SHA512 0a9c4e1066228375839438db61f1059206ff49bca4b7aa4b8f00ccb300e6dd0500b5d152aa93c73d9b442c0d97d333e19837272e3562b875672ddca078245612
+EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 912 BLAKE2B b0c7e26c0b482cff02e6f4b7955490b15c343cdab11d2095a4c2ee0497ac38c82627f63867e42135fe4078559f15983b69a418f0eb4369524622b1a374d13701 SHA512 d9b5d048675b00315a17dceb2047a2bbae3eafe63b0a7ed1d05fc66d5755c28465797e048c1253a6488d81b0820136fd29cae2ce298f30e80e0e030119807f24
 MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index a9b6c40261bf..03118bb40338 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${PDEPEND} )"
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index ead16c756199..2b11d7d0d10f 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1,9 @@
 DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7b64815ccaeaa50f01ccff96adab914cfbe6674ce28088e5eb5717b44531565f961b1f159014d235275065070e22d96d08cd4af2 SHA512 0d1575079be7994df905de02d31ad2c9c3af9634a487fbc9c565067fcbef6c36fd4fbd326ccbee4b40b3ff14696ad85a97c68018a956ff3e2f7e1be46bb3a074
 DIST sphinxcontrib-spelling-5.0.0.tar.gz 38479 BLAKE2B 5fb20cb08529e1db9d5df25a31f09849dacf41003893dcc74355d70161269b18b3bda7eb2dcc279250190e6eb2ead7a3bb1d40ac4a4d5db1a390f339a22da777 SHA512 bd608e13d1643924d69336da6a5fedac3f60ffbbf0d367c203936395270b2504f45db2ec0d2fe179a86dc91616e458c6fa0d2a6f66a20ee956c5f52ece1140ce
+DIST sphinxcontrib-spelling-5.1.0.tar.gz 22942 BLAKE2B 00861b429b66667ed45791f9dd8394b23cf2982875a9e3470c1e2dee22ff0500515d409821a73e46b49bcf397e9ef40f377f933e460b8673579b1f234bf157e4 SHA512 22c5c4eac56c0138e33aae38c2ed1d254211c502087e4c0ebebf2b3b7df69d2567cacde394abb2d8385eab48ea6e3ac9282c980bc8b52408f46bc06ab9634fa4
+DIST sphinxcontrib-spelling-5.1.1.tar.gz 22883 BLAKE2B eb5d13e73221dd4de86ebddc5222ee75b152a0e7681e93c0cfd66767903a949cb3d967c12bf553a67bfcd2854133f1164b965711781601753420f5f6a132bc7e SHA512 79825228d35e98fc85e4d1d6cfcc3f720df68b7f1493a0907e712369fcb76fc30d96de44fbbcc092e6978a797646da532489f420af42566ca4f9b5b932d85292
 EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1205 BLAKE2B 8aa26a7e4bb89148db02ed0b838fd5b03b8e85dfdd9e7929e39a3a9edfd7675a3f6673d3851f8af6f204b6f9164cdee62a9f3575a852afb55c4cb2a1cae68eb7 SHA512 77e9ded8067b711906e21eee5284d13381c4e602907598e9452fe238358db3c56d7bfee1ffe7f35c861f45aabd55c89f17cacdc06b9c6cba1d58c08b9d01a1ef
 EBUILD sphinxcontrib-spelling-5.0.0.ebuild 1232 BLAKE2B e25fe65bf383da4f7096536199c81372ad500b5b16174e9a61604f92edea230cee154455603ba434cdfdbe1c228849476be831979a7689c6a8bafb874a8d017d SHA512 ae2ccd4acb5132afdbc16f2685652d91a20d713abf256fde34753383184fe6c3737f93ca8a8513c46dbf62e9c733a5e9656a5874c6aac37031e5864f56cae0da
+EBUILD sphinxcontrib-spelling-5.1.0.ebuild 1231 BLAKE2B 3971148c1c3e13f254e4242920dc371ed336229408f01428c7704e97f9c825ab4d40172bfbfc32df2354ddced287df2be4f5cad306769534abff6554fb7b79a6 SHA512 26d3fd133d270786cfcbab7e568fab1cdf61e3983ac366c5915e4e36c3148abe77fbe9fc82058bfdcd1e47de5f6b4655bb23671025ec88a4abedd4f65214f544
+EBUILD sphinxcontrib-spelling-5.1.1.ebuild 945 BLAKE2B 3b395b17048904a7c84c44618f52e0e63929769f4ee90748e3958ea47378d2f11e675ba97d60d12152faf89de023e02737ca4bfc10cf16d08e8038e5e1cf2830 SHA512 5b79be68ae961bbc490168a4be3508ed6d77a0cf5d1ac423a2323d2ffdde2db5c083027dd9e0aba278466ed39cfdb7d0ccde02ef6b13d717722e83362d8bc03c
 MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
new file mode 100644
index 000000000000..232987d99eef
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${COMMON_DEPEND}
+		app-dicts/myspell-en
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.1.ebuild
new file mode 100644
index 000000000000..5b51077280e2
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source --no-autodoc
+distutils_enable_tests unittest
+
+RDEPEND+="
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 58a8e00d43d3..da4b607f8d8b 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -3,5 +3,5 @@ DIST sphinxcontrib-websupport-1.2.1.gh.tar.gz 599593 BLAKE2B b996db8c799399c8830
 DIST sphinxcontrib-websupport-1.2.2.gh.tar.gz 599606 BLAKE2B d7e5754491d0f4e4b508bb5ed58f41d6f57c8785ce2d658cd4beb658b9a01a453bd791e73deab703ebf17d18ddf0a3adc7c72a49e80c33475daca41666da694d SHA512 39d7d688515440fcf7a0df9cff60402499956da4c4d5de4e7b38982ff23ed837e7851a3c747135b9298d0df59f3055a8f588be78f10d98110ab50b8ab434db34
 EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1174 BLAKE2B 27464db31f09b246efd1aac60af5a10156b2d3d920b5c792302a8c149f4efd244de1e5153480d6358910bbcbd38dde71a517ef18e58b64e2011bd5d8c9d7d405 SHA512 7c4bad117252a35c2aa92a0a7c432e3f298aa54627a3af45d2ddaa481035076fd3439aa080331e122d3487ae6cd200c7383817b6ebf85ec1ad35f3cb318af9b3
 EBUILD sphinxcontrib-websupport-1.2.1.ebuild 1226 BLAKE2B 04c3ad496a43aa227d7f54934028a5c278ab813c4dd41d57e068931eecfcf8f1e0f39b047db1f3349dd68fcb50ccf379da477f49d4548b2151663747af4191ec SHA512 b64cfaca1c9239c00c5e5dca3f99cf457fa413ce06e6211135b4f588b2adf8f4b0f3524c828ca5e0620660ac9b5b3e9c6bbbc17c99ace0f5c9151b639cab4f98
-EBUILD sphinxcontrib-websupport-1.2.2.ebuild 1235 BLAKE2B d681b0b7967d0451e008859c5bd38653459e6555073ceddbbee6062c6f3a33872f274dae1aa4d45c1dded33a89442e82861abdd692dcef8bd486841570059257 SHA512 f41a6a21df7556ced014cbaba5de937bd75746541e6ee6021f135cbc4e57b145278698e63c5a676a5fad923e474dd350e04f19c89ef0bf73e4051c727daca34d
+EBUILD sphinxcontrib-websupport-1.2.2.ebuild 1234 BLAKE2B 22649b4b4b10e1e59541ba23dbb25f85d6cd9066156a6d72b664f347cdbfa01030a988d12f93021cea18e6090ae574ea040d0180fbd6b81a0b6700e821b42050 SHA512 72c29f46fd1ed6509f811b3110f2977f91ea8e188bb9e0b95e1a433ff419e6832155a064e7f0815a39f56a8e3984e430527920d625d2c20f532c02431361e0ac
 MISC metadata.xml 613 BLAKE2B 2113d218297d01838878ae22852cf3e78c7bc8807f2c46b1eee03442b3e0af2d3762d331adde3d116cfc71bf5f0e0d7f2b5d1f26a18d9c5fe068eede34f971ca SHA512 ec3a2a5917a3332c95d48f42d0ad2d0bf91745c2f61f57f1efa11d80bd828e635cff0c22e604cc11aa7ddbbc73dc93ff58415c75c87b4c00cb60c668e721b993
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
index a98a22eff6f7..600953456c9e 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
new file mode 100644
index 000000000000..b20ae28cfc87
--- /dev/null
+++ b/dev-python/spur/Manifest
@@ -0,0 +1,3 @@
+DIST spur.py-0.3.21.gh.tar.gz 17666 BLAKE2B 0628417e6b5f4c744041693445113a59daac4f89776bc39849a2e1fab21826f3c6783bf72bf528a262f05df08d0680044e69f119c367f29ca4d6f0df554fa49d SHA512 7cd49690b989952707629fad5682201dc7f00865d8120da9e84eb9046e7a8fe7b7183785b4c2eac996d2743025cc09508b0ceb7b762b7bddb5447ecbc42d00a4
+EBUILD spur-0.3.21.ebuild 1114 BLAKE2B d88073e0e89b74c513f40fc7dc6a046e2cec66f207185b84a64e0107eb2bc848f447d6f65f8d9adc245330fb62dac8ef68af4f0396a4795392add9baf05ad116 SHA512 ac720f0560f6d15052725a4cf95bb072b9fc138216f1be4e4055a7cd650c52b90a257d6ec6d514315b1c5d1b998ede433eba30f33c57a8bb2c590a1023623d03
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pyalsaaudio/metadata.xml b/dev-python/spur/metadata.xml
index ee4de466b8ce..266e3f19ca59 100644
--- a/dev-python/pyalsaaudio/metadata.xml
+++ b/dev-python/spur/metadata.xml
@@ -3,10 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pyalsaaudio</remote-id>
-		<remote-id type="sourceforge">pyalsaaudio</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-python/spur/spur-0.3.21.ebuild b/dev-python/spur/spur-0.3.21.ebuild
new file mode 100644
index 000000000000..d5660abfffe1
--- /dev/null
+++ b/dev-python/spur/spur-0.3.21.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=spur.py-${PV}
+DESCRIPTION="Run commands locally or over SSH using the same interface"
+HOMEPAGE="https://github.com/mwilliamson/spur.py"
+SRC_URI="
+	https://github.com/mwilliamson/spur.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# TODO: set up a local SSH server?
+	rm tests/{ssh_tests,testing}.py || die
+
+	# does random guesswork on top of exceptions that stopped working
+	# in py3.8;  this only causes a different exception to be raised
+	# https://github.com/mwilliamson/spur.py/issues/85
+	sed -e 's:spawning_command_that_uses_path_env_variable_asks_if_command_is_installed:_&:' \
+		-e 's:spawning_non_existent_command_raises_specific_no_such_command_exception:_&:' \
+		-e 's:using_non_existent_command_and_correct_cwd_raises_no_such_command_exception:_&:' \
+		-i tests/process_test_set.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index dca38b47c776..a1557eb75d8d 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -3,5 +3,5 @@ AUX sqlalchemy-migrate-0.13-disable-sphinx-exts.patch 497 BLAKE2B d66dae755df49a
 DIST sqlalchemy-migrate-0.12.0.tar.gz 128499 BLAKE2B 352b34f0c9490019748183dfd9c4b7e0064fece007de9ea46da88bcb7187b55ae3b502b45c919aac0d89586e4b9a19955be2df3ef81dc8b8328a0e9da7177e46 SHA512 bbab28a67afadfeb33a0a3c303c7e623de051923fef7c30b1896cb2f34fe325036c3730d93ad5f88ffb35aff25de22e1c770dff68dedd6acfbc4027e127857fb
 DIST sqlalchemy-migrate-0.13.0.tar.gz 131424 BLAKE2B 925ee05144360c469d714342005c8b79dc0f1ef7c07ec641c00ec39e4aa18046b3afa7524f4e5afeb292cf78b2b85bac714f44102e0daf799ce09f0af40f3047 SHA512 1ca826a5d80c1373ffc4b2366dfb6d5dd24204964462873451c97d8ff4d75fc6c63f663c4769b7f6cc00002f6a98d425f41d759e5c010b4b81a8b74ffbb102b6
 EBUILD sqlalchemy-migrate-0.12.0.ebuild 1361 BLAKE2B c6c724a814f18a4bff5d48b7e1638e6662b1d53ec6941f62fb27b42e87988f0dd3f721df9743981457bbcefa3cbe6e92d183b18f2cccb49391a662170844a6fa SHA512 aff3a4ae4ef7b75ec890da6b8075b860cceda00dc04189fe3d7d34fdbf263f3873fe4fac86538a1199cebf2e7a9deccdda4970ebaa375476ae073094c3b5f48f
-EBUILD sqlalchemy-migrate-0.13.0.ebuild 1329 BLAKE2B a5376af1769a424152ca0ad201468e7e0394f3ca499443c9a4b65f29e4f9cf474a97d65c5d38c764c71db04028f85eadd3dd7fdb966b19445640340a7a63e3b0 SHA512 2fb25cb61a6822e3a63da2d2c2055f97855385049df7b83574618af3cbf77638b6cba88702fc5ff8eaca00d5560ec3b285dd7a85e7069c666da5cddf6dbe1332
+EBUILD sqlalchemy-migrate-0.13.0.ebuild 1322 BLAKE2B d9e8eeaa7f36d4fe463aaf2a61ef009d41013277cb8198cd87a34c692042464dfe4711709aa4ffaa8dcca2642468d25d2e8b6b4f544313c9a4e6616984a5fce7 SHA512 bb0aaeb431bc7c53ccb97e94063fb226448b328e34e75b81d4d3be8e29bc52a58be49ca02a3af33f29b047318846afa222d394f5b4d087e84952e4e55d7840b8
 MISC metadata.xml 331 BLAKE2B 0f9105a458c3ae2b81bc9d2a6697d5b3ca8f249a8111564d34c49850d9017f21f2b85e1d0f1f7e458546f1b28a1d90e5e5c33286e78b77695598ac85b7c9d53f SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
index 2ddfe6682bea..3c6373df382b 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 5849e7879df1..136224c8c49b 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,5 +2,5 @@ AUX sqlalchemy-pytest-deprecation.patch 2695 BLAKE2B d71c791e39a6caf9d8e67dc61ed
 DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
 EBUILD sqlalchemy-1.3.11.ebuild 1598 BLAKE2B 6fe7989cee639c1299f36553fb1af8c2b94968622db2ce909d3a7af2443fe9ee8875dd5ea2c0fd862a62a42e58e18425c7ce3f7b7db74e3244f6f2cec85edc80 SHA512 c18a8f06666afd03c7852e5bbd5ea380ac28684f26af01b656cdbe8589754cf0ad6dbd57a2a059616a0bc55c02dad0130afdc265ed86d7ec41b3c7e37e1791fb
-EBUILD sqlalchemy-1.3.17.ebuild 1482 BLAKE2B fa70e305f72f28afffbc8a9cc258ad48a0543d5f154d98b500f6ac861b03cc45f96e9d36495978d3a36488cfcbfe298517d8b01615308378c21df2485fd780f5 SHA512 dbe8cb4d6aec2c8a664a1ab1f4bdc1283b33163d0fe2e2b4fec2b430f44590e0fe3b2459619680f0aec4c0ca86f409d1cc61ea359c908a2ead6e57ac084b8115
+EBUILD sqlalchemy-1.3.17.ebuild 1481 BLAKE2B 7e80fa096e65dc95caba7112f9f870d74d983bace3a16b3a836b6fe7eb50ab4f07ef05c8c16aa5bf615ed317a76fbc73943de29ed208c1e095e9f87ff70f2b45 SHA512 f85616ea8aeb83ebf1e70a9b95296fc966fdc5152dfe7e29325703649c7f37a801017ac5eed55359acb04c530fd808fed70d71a4f8eaeb5fb34156b0efd669b9
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 9f7ad07d19fd..d73c691aa0a2 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index cdf470f5d590..5d6961113a09 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
-EBUILD stestr-2.1.0-r1.ebuild 1084 BLAKE2B bd9950677c3f8b54b96540878200303c392ded8a66a14ca2aa31918cacb9697e647b464d0c4b66d8a5dfd31bed8546ae2bc082292a45c8642f817ceb8183c0fa SHA512 044bfee1f017959abaa106b39ab3e7c03afb94c9ba03021c7ceb3b8f22d79ff0aa9ef546afc29168af091060c96a0a9a0b39b2fe8a6bdb1d14e39d61d8283796
+EBUILD stestr-2.1.0-r1.ebuild 1091 BLAKE2B d224cee1b399d389932886cbed44d086ce522924b42be942b28892c432c5f44948cad427237cf46a59308337b78b37b41de441c2a7c1cfd59dbcd24e0568587a SHA512 817765a8902154e8139f5b4503a3c9bf2c63dd552e3369fe06674aa37430b2c52823cdc4bc1958fa7ac337268d33c1ab94b235db1907fd09eec723d4cdf5852d
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-2.1.0-r1.ebuild b/dev-python/stestr/stestr-2.1.0-r1.ebuild
index 7ad0682e5afa..7c18fc139cbe 100644
--- a/dev-python/stestr/stestr-2.1.0-r1.ebuild
+++ b/dev-python/stestr/stestr-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 8528c4e6db37..d5089ee6987d 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,3 +1,7 @@
 DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
-EBUILD stevedore-1.31.0-r1.ebuild 1224 BLAKE2B bf6f29c36a3387c88117cb345c67232924e3c0fe412c552c384d751db2986a7896930bb7158ae3afeb14a362fd2d29f6bb161d3d6b634d1641c84e0b69abf400 SHA512 e23b3aea50145ff5ae10c2c7b5bc7737898b6f240834dad739d68aaf1142090fd268dbe980abeb99fcdbbed8ca429d4ad17bffaefb4cbf9336345df8fe9cbb4d
+DIST stevedore-1.32.0.tar.gz 510344 BLAKE2B 96de6598245e88900ba0f0bd69b976425fc5be2c783f32c551ebb2536dc5fde7fab18121947f3f9caa4d7d822372ad502d272285cc66368bfc39c566821a0160 SHA512 98c66b9ac827f69737cc2522029108831380b4bf4c633786d9819b52be930f6116ce5bfab58e724a2efad147830fcb6353409322fc5e01617d35d1c8aafb0259
+DIST stevedore-2.0.0.tar.gz 508206 BLAKE2B c8e8d1044d1af4e2d0366cd836c36783f49a97c54761070d0af3d7c31b7a3bbdc8d98dfadf2425b73b30d7a37b3bb5ca3cde71a6eea76513f9c565aa7c94511d SHA512 10b091749b638330703c256e8614a9519059edcaf109944a0ca04bda5c5fde0d9ab473dc8293cde809867dbd1c2a23cd96d0faaa1f7d802ad68aa0a5aa972a0e
+EBUILD stevedore-1.31.0-r1.ebuild 1231 BLAKE2B 1d3b70997d0c968acdc791eadb19b5792f6f7a112fb7bc6bbb98c7f27c40df122d1460719d5201a0731bbd9b01539a1ba7f033bfed87b859389374c8c732f447 SHA512 7ba44275a50e9a70d996b2056d60d80e20c47371e3a11282dcd2d0287707042413db665e358f24db063a501d3c07f3d222ce4b75926a84bd33715087232ee12a
+EBUILD stevedore-1.32.0.ebuild 983 BLAKE2B f18f58031cf154999d335cbcdbf6e94c96dbafef31a6b18d7420fd9df4161ac5b0afaca02a08f58c71573f548d65e376e482e0d372037c24e80781cd4c740e28 SHA512 e4b783883a4ebcba529911c8aa61b5948f9eeff507bcc339b2b2efa2cde4064621e7ec1edab3843d803462504d321df295afed29652ed43dd78d54fabdb96e8b
+EBUILD stevedore-2.0.0.ebuild 983 BLAKE2B f18f58031cf154999d335cbcdbf6e94c96dbafef31a6b18d7420fd9df4161ac5b0afaca02a08f58c71573f548d65e376e482e0d372037c24e80781cd4c740e28 SHA512 e4b783883a4ebcba529911c8aa61b5948f9eeff507bcc339b2b2efa2cde4064621e7ec1edab3843d803462504d321df295afed29652ed43dd78d54fabdb96e8b
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-1.31.0-r1.ebuild b/dev-python/stevedore/stevedore-1.31.0-r1.ebuild
index 6177b94cd3a9..4bfc1c28921a 100644
--- a/dev-python/stevedore/stevedore-1.31.0-r1.ebuild
+++ b/dev-python/stevedore/stevedore-1.31.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stevedore/stevedore-1.32.0.ebuild b/dev-python/stevedore/stevedore-1.32.0.ebuild
new file mode 100644
index 000000000000..96df662c46eb
--- /dev/null
+++ b/dev-python/stevedore/stevedore-1.32.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/stevedore/stevedore-2.0.0.ebuild b/dev-python/stevedore/stevedore-2.0.0.ebuild
new file mode 100644
index 000000000000..96df662c46eb
--- /dev/null
+++ b/dev-python/stevedore/stevedore-2.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index b1aebf605f87..106838dff09f 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,5 @@
 DIST stripe-2.43.0.tar.gz 211400 BLAKE2B 135371f793af291e1c43179bcb325a9eb84c3258d9013009f920077fbc783569b6384fa76dcf464aa9fdbe64a4a297d6c232f3719729a81e1d62c74b769ff5f7 SHA512 a91f4f268b5c533cdd378c3169cf6e29b11b3b79492cd8b01b21970459383d63fa726fb206aba111ef8e57c2b98eecd6ba3ef9fdb868efc2db69f0cba8f74554
 DIST stripe-2.46.0.tar.gz 218080 BLAKE2B 990535efd32b5ddfe166d5b6ad1cdcd966df53fe830a10938355cac10287542284a73f99332878225388a3c28ba431baf96fa4e6e745345c9fa02e64a7e33c0f SHA512 dbfa586cfe7897b32fe95b7230fca5ccb8a12b429982776ee8873878fb6b7284cbb924e8dc6031d59647cc6080115ad541fda02d320c091b6c1bb374679d2213
 EBUILD stripe-2.43.0.ebuild 2029 BLAKE2B 51966095057589fed71b98e1adefeec61bc968ad09ce1e99c75f4705d4ea266b0e7a9a808b36d3700c66b8dd3fe9f18bb2998ddcf56a68279a08140575614b4d SHA512 2e475ea7c089564bff6fd356c51da7808cf9a58a6ab1f40c5eb61adab7034fd2a9c253155061193a72a0df0d100a6e616504db822d4a2a8ac426d568a1f123ff
-EBUILD stripe-2.46.0.ebuild 2031 BLAKE2B eb5b52e4e0a108e9a1d8cb75cfc230612ced16a3145928b2e1a738a245f1dcf61aebda7dbcb3b098af539865e1de6237fc0c3dd973360a5f6170bdcb29b8f101 SHA512 9cecd6cf58b715ac08028a748f1619ebf1b1f67ffb477043a725a400b5dedf9c3708874de1fbcb83608fc69818cc698345fe6dd507a0d26617bd754adb1916f8
+EBUILD stripe-2.46.0.ebuild 2029 BLAKE2B c768e553dd74bcfcf2956c09a68f126b62145b70e6deef0539a1bc85b04d056ab1b66d56eb7ab86ecdd75e75e10e93888333dba780a9d43587c43f5179c0cb1a SHA512 0d0aee9f4dc7f5bac41ad0ae09f96c08cf578ea9532551ca5a0653a6a9e60ad99ab830413b5139b88dee8a06cefaca5ac4397b9729ddbd34599dafb42fbfce0a
 MISC metadata.xml 452 BLAKE2B 5be38e3d7907a96732d8e49e636c5e150de12a80f82f8a569969ab0894507398aaa2fd633b767a263db379688360a6805bc68b223f101a817c2dad94546d35c6 SHA512 b289dc8bcabfcffa651ae325a37621c952d86c15f0d1ebcf03ac76e4da577973d57ff211ee3773c95f8ec9c354b391185b825f3f93f03f7c6805eab84b1f5155
diff --git a/dev-python/stripe/stripe-2.46.0.ebuild b/dev-python/stripe/stripe-2.46.0.ebuild
index 16c31038e92a..f40ceeb643a3 100644
--- a/dev-python/stripe/stripe-2.46.0.ebuild
+++ b/dev-python/stripe/stripe-2.46.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/subprocess32/Manifest b/dev-python/subprocess32/Manifest
index e91f88f37548..0032e4e47508 100644
--- a/dev-python/subprocess32/Manifest
+++ b/dev-python/subprocess32/Manifest
@@ -1,4 +1,3 @@
-AUX subprocess32-3.2.7-sandbox-test-fix.patch 672 BLAKE2B fbc99c70cef17dd1a0e1e7f08952a63911802c3827a4e0c5859d65563e7308fd766bb88b689465c288375a40411b6875a9bdbefad108ba9162f4b9501e8beecf SHA512 cdfa5b9ee56df54c2d122624815e472f9dd13e101a8d221adb48d21b1f7cd0ff3187d69f91c0ed7f164ee69348ffedde22a1d32a101d1eade85d6882ad47b6d0
 DIST subprocess32-3.5.4.tar.gz 97373 BLAKE2B 712b6545684fc7908a24ffae94d0967e168773a3b52a0701828ee2741255919927d24972a3c0579dadb5b187a63429d2a24e089e535bd3c41d6f48adc27b1166 SHA512 c811bdb5842d9f5ed9e51df4d13ba39045fbe98ca6e90a2c8138e68e44c2a55a2f0f3eb3e77e26caa3f88c360584912b001a0ca37ba68ac6c946c68c7a37d29a
 EBUILD subprocess32-3.5.4.ebuild 575 BLAKE2B 04f7fc693c4e7d9f1c0a212dc2f365a634497b526f6f3c17bc4ff528016f762c107fc764e18a18ca01b81d767158198296797393930c8811ec4afc524a3e9a67 SHA512 abd51930a1917127578046230dfefcf66db642417702ccc4c252aa6d5623561b822ff93bf4643949417b85b60dc3a6cb316a29caf118a9135070b441542c816b
 MISC metadata.xml 393 BLAKE2B d08d7fa6dace5a9d27aa7c6ee6df3c925d6fabe4f8a8d8f3036fce842652ef468bd2cb0a1735f841622b395569be14a8353c17aec60276b8fa7f21be5e107cc5 SHA512 0c015bdd15a504432cc6b804c66384260d2cf0b77ffbdc8af36a82e31e2c6ecf6a62c2c4d156afbaf30afcadcb3f5fdedff70b73a4c2381b5bc7fedcb5f36d4a
diff --git a/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch b/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
deleted file mode 100644
index 50e4a511fc4b..000000000000
--- a/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test_subprocess32.py b/test_subprocess32.py
-index c312949..000f7d6 100644
---- a/test_subprocess32.py
-+++ b/test_subprocess32.py
-@@ -538,7 +538,8 @@ class ProcessTestCase(BaseTestCase):
-                 [sys.executable, "-c",
-                  'import os; '
-                  'print([k for k in os.environ.keys() '
--                 '       if ("VERSIONER" not in k and "__CF" not in k)])'],
-+                 '       if ("VERSIONER" not in k and "__CF" not in k and '
-+                 '           "LD_PRELOAD" not in k and "SANDBOX_" not in k)])'],
-                 stdout=subprocess.PIPE, env={})
-         try:
-             stdout, stderr = p.communicate()
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 2f77f9f49230..63e4dcf50e16 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,6 @@
 AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0
 DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
+DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
 EBUILD subunit-1.2.0-r1.ebuild 2648 BLAKE2B 9dae2596010720cf2858941036cd59cbcaad8e53cf17c17eba759d33e3ff86316427d734d2b198212e3febbd4a4b00b8174cb3de61f676e3681f14743d6711a5 SHA512 d93c2d7093e11e0892d5a638e41fa0b0d5c4b7ba4a1181eec5a235fdf139086afe1f645ca2596df223f86500bd08e8db1be7ec2dcf38dd71f9e4f85ab8e210f9
+EBUILD subunit-1.4.0.ebuild 2422 BLAKE2B 1858c0f0e4ab24cd7857f97e8b0378da682549d7fb1b2038d1c19d6545aaede31adfa3dbdc610113560b9cafae0f92e9c515516557d4c432b767ae1a086db79f SHA512 89f70774327380dcc07d857d663bf84c77a095fb83b0fb10d4bff3e2217c5acfc59b89eb510f11eecc8aea60ee5e763d588e78ff00c7b225702e306ef39527d3
 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
new file mode 100644
index 000000000000..73b540892dab
--- /dev/null
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1 multilib-minimal
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+	dev-python/extras[${PYTHON_USEDEP}]
+	dev-lang/perl:="
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
+	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
+
+	# Install perl modules in vendor_perl, bug 534654.
+	export INSTALLDIRS=vendor
+
+	# fails on py3.6
+	sed -i -e 's:test_add_tag:_&:' \
+		python/subunit/tests/test_subunit_tags.py || die
+
+	distutils-r1_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && distutils-r1_src_compile
+}
+
+python_test() {
+	local -x PATH="${PWD}/shell/share:${PATH}"
+	local -x PYTHONPATH=python
+	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
+	# DO NOT re-file
+	# test_add_error test_add_error_details test_add_expected_failure
+	# test_add_expected_failure_details test_add_failure test_add_failure
+	# https://bugs.launchpad.net/subunit/+bug/1436686
+
+	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	local targets=(
+		install-include_subunitHEADERS
+		install-pcdataDATA
+		install-exec-local
+		install-libLTLIBRARIES
+	)
+	emake DESTDIR="${D}" "${targets[@]}"
+
+	multilib_is_native_abi && distutils-r1_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index bae2533b2d85..84e35f672573 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,4 +1,4 @@
 AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1edeca04cf11f37a86e51ac94641b9037384ca54d808adba9196d057a9007559cd6b7b9ad442e94a8ca1f7f54ac6ef609e72c47d SHA512 7fab4bd5a493c6f6831e88f8e26497b09614f6b04b651c96d5c44639ed03531c14dcee9412970cd2f24e056dc4046a3d3ea708083a14d14ab952921ae7fb7534
 DIST tabulate-0.8.6.tar.gz 39420 BLAKE2B 28cd8c175b258b56a406a78d7891919a49c867d848843365605ccdcb8ba0b307f1448967a124d57b0f6264169104c9cccc84982fea666a035a265a3c9f10cc43 SHA512 ec4d7a7f20db306be1a460276e0b1b1e63fd1ca14b208a45a297508bddbc07b034e03fcb5ff67fe5e2b9419f308900675994a6dccef755c975ad0b1e9124072f
-EBUILD tabulate-0.8.6.ebuild 945 BLAKE2B 3a8b0dbd673468ea7a2548e849e01070f96f553308f1fa36e70ccb119080427d02881523512ca0598007124c248d106beedaf803facf354312568fca0aa65990 SHA512 9c2ed1dea4182d58efca138fd91f672aa7537d13f2e3d1e2343237712a08cb17ca7ff355ee3991f9696c0aaee2289d2513ff18eac6bb8c6478d34915472c6593
+EBUILD tabulate-0.8.6.ebuild 943 BLAKE2B 7405db716474e30def291b4bd7986cbc59aebfa78c3a0e7147c81a418811f29a88600958888444eb6b69456c479fc35816ba185fb02312611c02669e46257526 SHA512 fd0c81ff842b0b3783e9aa4cb799e2798e2905b773f901fbd117f23ded055eb987c234d7a074009d78ff358011e08c85f046c1302582d23ebacd46d77f1548fa
 MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
diff --git a/dev-python/tabulate/tabulate-0.8.6.ebuild b/dev-python/tabulate/tabulate-0.8.6.ebuild
index e52f049d3415..d8c753700d32 100644
--- a/dev-python/tabulate/tabulate-0.8.6.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/python-${P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index edd8f92bcd8e..a2ffbe849424 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,6 +1,9 @@
 AUX tappy-2.4-yaml.patch 2387 BLAKE2B 22e64a124a81f3459bad202cf22112a2749c752870a1d47e768e3df4ef087f7d20f8ab9ae40f4f08cb69f5be22b6d5a364d8408dca76268f2b91328420b464b6 SHA512 e2c94768a23e816c126fcd1c11d550492743682c0a347b3cb734adf741e51f693f46c81b9da0688976cc4f0bea153665e338aa50e95e6334182f075e10f811dc
+AUX tappy-2.6.2-yaml.patch 1317 BLAKE2B d9ccf6f7f082080a458576a4492a114c90e2b968e07730fb115263a0e8ff84d747ae81bc403677db3eeae635505ced3a36c5dd1b5a843d4cae8a9649e0bae128 SHA512 8829abb2c2c1ccef63867bbbd7add683615394ef46a6f78861f884dc2dcbd7d4c9556605476c039d6bd24150c0acfcd3f03654c4adb5ca192d735ed9dbce6074
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
+DIST tap.py-2.6.2.tar.gz 148974 BLAKE2B 5e33c7af37c2533b4fd5b45684cc93793027b50c09fde34a4a8ff80c58510a50f5f21295852c14bef506c783cae6293bae521c5fdd696752c221cc49c7d2713e SHA512 2cd0b1b69f155970cf2367766cca96bc8391e074edc754531f0511c3dd027a0a8e95bb8481b627b2610ec9b5f685ebff95f07f5f97eb31c321d96590286be803
 DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
 EBUILD tappy-2.4-r1.ebuild 966 BLAKE2B 23e0bd2dc3e5d034163f0c6062423b2e6dba97368321d0c4a96230381f2a281d1efa26f7e051572e0c12be2268782d23bf1e70854774e173c9eca4992b7662c9 SHA512 7ef744f84331b3ecf541a3301f54a301aa87b229f3e801fd84cfef65de446deb4e343bbc9dda3c50f888d1bce3e2725331e43850c310cc4848592dd2ee15664c
-EBUILD tappy-3.0.ebuild 914 BLAKE2B 601b535c2eb4ec7861fe719b89f868f185b8632aec0b222d0d750f7ccf80bb885b5276ef275027afaa6bb10ed9a9810e13cb804b3eb974dfe7ea3dfe95e714cc SHA512 fb305a5053ef78eb568cd443b151b45aebfde9260cab807253032f8ac88cdf93febbcbb6bc4d1eb7731641a784ed4995ab39e311457fd93fd34eddb99abcb841
+EBUILD tappy-2.6.2.ebuild 973 BLAKE2B 4cfca43a10f5c625293fe2d54765bf983f62148276cd7ae13efb0ad7e4428564ef1bfb2a5765e0ca5fe70a6daea1790a35ef77e6ecb650d331e5670b5fb8a4c9 SHA512 a349e8985b100286badf3282b63241d8d418767d5fd4694628371c5c94e386e59f21b85c2294baae004fbb7f769547c66da2988376f3b8ba5e1111c7a85247ff
+EBUILD tappy-3.0.ebuild 848 BLAKE2B b3022a0abd98ffd5dd49690e7fe56942c849461606b3fd46da8c8a24d6863755f6aeb8fab06084192b6c0ec6df97525ed024ffc59606d6e94bd40ecb08af5d4d SHA512 915f6004d1232e880a75ce901929aa43b223ae187704149adfb0a1215ede71026960e9fea07b94956091213fab1d340e18aa3fb3f244409d809d73b512fc8eea
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/files/tappy-2.6.2-yaml.patch b/dev-python/tappy/files/tappy-2.6.2-yaml.patch
new file mode 100644
index 000000000000..791ac3bc7b92
--- /dev/null
+++ b/dev-python/tappy/files/tappy-2.6.2-yaml.patch
@@ -0,0 +1,37 @@
+From 116aa55f5d1ae1f82604ae377e07a751f61bb651 Mon Sep 17 00:00:00 2001
+From: Matt Layman <matthewlayman@gmail.com>
+Date: Sat, 14 Dec 2019 21:20:22 -0500
+Subject: [PATCH] Use PyYAML safe loader and remove deprecation warning. (#103)
+
+Fixes #102
+---
+ setup.py    | 2 +-
+ tap/line.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 2d001da..4c59879 100644
+--- a/setup.py
++++ b/setup.py
+@@ -63,7 +63,7 @@ def run(self):
+         zip_safe=False,
+         platforms="any",
+         install_requires=[],
+-        extras_require={"yaml": ["more-itertools", "PyYAML"]},
++        extras_require={"yaml": ["more-itertools", "PyYAML>=5.1"]},
+         classifiers=[
+             "Development Status :: 5 - Production/Stable",
+             "Environment :: Console",
+diff --git a/tap/line.py b/tap/line.py
+index 0d44ff8..fc8f8e2 100644
+--- a/tap/line.py
++++ b/tap/line.py
+@@ -96,7 +96,7 @@ def yaml_block(self):
+         """
+         if LOAD_YAML and self._yaml_block is not None:
+             try:
+-                yaml_dict = yaml.load(self._yaml_block)
++                yaml_dict = yaml.load(self._yaml_block, Loader=yaml.SafeLoader)
+                 return yaml_dict
+             except yaml.error.YAMLError:
+                 print("Error parsing yaml block. Check formatting.")
diff --git a/dev-python/tappy/tappy-2.6.2.ebuild b/dev-python/tappy/tappy-2.6.2.ebuild
new file mode 100644
index 000000000000..de2c6cdf8f81
--- /dev/null
+++ b/dev-python/tappy/tappy-2.6.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+inherit distutils-r1
+
+MY_PN=tap.py
+DESCRIPTION="Test Anything Protocol (TAP) tools"
+HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="yaml"
+
+RDEPEND="
+	yaml? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+		' -2)
+	)"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-yaml.patch
+)
diff --git a/dev-python/tappy/tappy-3.0.ebuild b/dev-python/tappy/tappy-3.0.ebuild
index 8143c4ab1f2c..ffad5f6ae398 100644
--- a/dev-python/tappy/tappy-3.0.ebuild
+++ b/dev-python/tappy/tappy-3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 MY_PN=tap.py
@@ -23,13 +23,11 @@ RDEPEND="
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)"
-DEPEND="dev-python/Babel[${PYTHON_USEDEP}]
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
 	test? (
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
 	)"
 
 distutils_enable_tests unittest
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index a8f2b6cdc0ea..6cb6991fa1f7 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1,5 +1,5 @@
 DIST taskflow-3.5.0.tar.gz 1068208 BLAKE2B 5c11faf60f332aad442c5415219f572a6b14735fdeb30f305a1e033067a847bbb6a827395bd1f02ae20e11b682adf31585848ecac47438b1860fd04b51a7d5b4 SHA512 635123ed975461a84790be2edb09f45e3c372fa03918f6f6257b4a3725f67a83a958f80ca15f1da5eb7d5f6223ba8fb8a6bdc6941b9eb9572c12274fb2d75ac0
 DIST taskflow-4.1.0.tar.gz 1063167 BLAKE2B a6a8c745d88b72a6c2bf23a7263acec204c0b29c61095f87e7f866b067675db3bcacd39c52318db7fc2671a84059fb2f72a047bafbd1d522ea9035db6e473baf SHA512 94d572901126bff16b82e5ff1ffbb289fe165414ad0457d1282f7100a9f21bf9ce5afbbd76d68e60b96e9661bc89c95f50ddc99e77dfc47053e9d7a684c503a1
 EBUILD taskflow-3.5.0.ebuild 1398 BLAKE2B 516e02c65ba213ca4e0e21a06a440cf7bc45810a26d5a67b57ceae6a6a0f27f720706d159cd194dc32d7cefa7959e46baede66ef79f76e0aada7e8a027cf5fee SHA512 838b28d5010213edb7be15e5765dd7e5ee58d92d650ffd01144f479e44a77009f834892faebffb02bd1486ca035539afac985da88f9aaa783bc358b49a6a3e7a
-EBUILD taskflow-4.1.0.ebuild 1301 BLAKE2B 2d4abdc3fefe59588a7aebbe49a7e8d69318c348966cefe086714951d3b9357d4e27b8647b04a3f885ddb3d9956a93628de83d26fea3400a850eb4d71c0d9eef SHA512 e8bdbb36aece34e1c1f9e09bd992a9f1df8cb2ce7b8d3a3dac8bc57279b34e170ad87946e8377c8550c113a28769436677fc974a5a36934cdc2dd89a0285bb0b
+EBUILD taskflow-4.1.0.ebuild 1299 BLAKE2B ad6340379e0ca60ecb80b320b37f6760dfc1875e39fc6560b43a02ca5254bb70b1a5252477c3a319c7acd7a425de486541fb0e52223972500fb4e5c92b24223d SHA512 d3bca12a590dfff324871b8e395a7b2af584fe1227cb343e64abbfa551f3e4f8b4febaa0b175c7f9cf2b29ae192c374eebf35c0267ef543a005513a3660f9445
 MISC metadata.xml 508 BLAKE2B c95568ffd128fb5136c780edf2b1f97ce10aaa96cb309634f4116fff00e830856c4aaa03c03031104839ef073d8cc18c1f456bcdb29d0645a33905d926e3fdfa SHA512 250e7af3cf5c87c88cdeb05d1f212f35de0f09396d4c7d54ca85005bc5d4282739abf1f8b71be0c7dbf3d218fba96c292300ad69377043eab1905e445109efc6
diff --git a/dev-python/taskflow/taskflow-4.1.0.ebuild b/dev-python/taskflow/taskflow-4.1.0.ebuild
index ad0bb365deee..55e23e3768a6 100644
--- a/dev-python/taskflow/taskflow-4.1.0.ebuild
+++ b/dev-python/taskflow/taskflow-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index ba8a46be313e..699d0ecf3f27 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -2,4 +2,4 @@ DIST tempora-1.14.1.tar.gz 19383 BLAKE2B f65896391e839c3da43bb42715459b9ab870a72
 DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
 EBUILD tempora-1.14.1-r1.ebuild 1449 BLAKE2B e9fac10aad944f8398c0acaa739d2de2b9d57d0589507a3d8df4fb9092edefde4d42f4d938ed5bc773752376c4e17d84fe288606943fd2bfcd5064019d2c3242 SHA512 653192a76817d729dc297fc52d9bf2382e5316c7f8b6d2d53675e5ab57e1e739e2440dd56312efdd856ce6c60902ed28d763dc6cb46d6b25a46064daa34a0644
 EBUILD tempora-3.0.0.ebuild 1519 BLAKE2B b4876110a8194a262c5af7406b4f11780b40b628883d42c6adeba5f37ef3ba8d582f33f2582d8ac8d40189f43e86de674f2a1499b31f96482a27168bec3a0583 SHA512 77641499ab83b8cefab1bad7471c676d036706fa88051f840517925bdc3ba8b6a3f6437089b816cbbb9a016c3b31e090e70744401b7ef3c3dbac0113962c67c5
-MISC metadata.xml 514 BLAKE2B a504d20d519ee139ccda1418b4a6f4d9c1b47a17dae26a57e2bc9e55d31b44f6f74b4a3835a6e9f376431b2428b5885b6931bdd6f11d57549c9ac29593b8e0ef SHA512 aed0cf45d8b0d1f3aa942dad7d74c572d6cb501c0c61438ca6bf97cbdfa51091cf9c32753cd92440ff69c7faae67daff0ccae28d9223b182ea89426bd4bf4fb1
+MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/metadata.xml b/dev-python/tempora/metadata.xml
index 9b6de18095eb..3ae289f9d10c 100644
--- a/dev-python/tempora/metadata.xml
+++ b/dev-python/tempora/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">tempora</remote-id>
 		<remote-id type="github">jaraco/tempora</remote-id>
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 32111e07bbfb..f5da3b19c4c2 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,5 +1,5 @@
 DIST tenacity-4.8.0.tar.gz 28057 BLAKE2B 31451b061c594a47fdf4e6ae97e09c601d95ef76afc805d6f746624e3cf18a0f7c288567a5fd5ff8c264d00ce55a635afa2920799c256168dd89ac800f0d3ca3 SHA512 4662a92325de6b2dd7f6dd8823cecfdf0cc2f1390d054c8ba14f84fedb917cf5896d5c26aaaba9816303dea06ad7f922877c8a09e248319317155e2d6f509873
 DIST tenacity-6.1.0.tar.gz 33438 BLAKE2B e3f7c0ef19f98c0ac5b2a9a1be53241292d895547e5c10810ff94c27f34e8bbca7ef3aea79ce6e4042c84109e209b4be2913e6231233a3b050c18ed52f8af087 SHA512 a8f52f77e066a35c4a35cdd80fe01922613d9f4ca07975aece4a35bc743475f7540bf419e5095eacf94cb248ce33bdd89b46c5e3c5bd5a93bd99a601cf580732
 EBUILD tenacity-4.8.0.ebuild 563 BLAKE2B 88ff228c34ba8927c221084c65a2f67f2700ab998ad09cf48a0c673f357a2800f5183b5813913ee06e9c4152e55c3f781cd63904253efee424d0cbf1fe441392 SHA512 c7c5e68ee700976c028e3af2c769b38d43d66bea53d7a7898523256e666ceb8aa2de026104c474810f1d6beac8cf1d24de7d7d7409b37b83679cc8842506dfb2
-EBUILD tenacity-6.1.0.ebuild 649 BLAKE2B 0f4e2275bdb2bcc9bd797ce9e39e874020fe5903f727604500632dcb1cf76200f656a13d1cf158e7eed1613a9c70b6d13ae72c2d29acd31d8b92b94c3c11b01a SHA512 2fdda55c8146cb5dacb714cf13291250e85733bd93f02798116266a2c004c9e1ea1c940ee0c2341a9f7854c3e31ee06a4082461cd14c4a7e819223b2f2fba682
+EBUILD tenacity-6.1.0.ebuild 692 BLAKE2B ee28707560df4915d4b7ff53d8071ece067c640c36c20a32acd3ac61539a6fcb62bd6b783401dc5b890418b6e6d861fddfb83d3f623b42dafd2633123da48fc8 SHA512 a7ec969ebb4d44f679841a6e39de773d0317419d2dcf2e605ebc24d98751d3b9115f5d6eaf0dfac15b3b51d08fc4992160616b0aaa0540344970afe17cbedc87
 MISC metadata.xml 730 BLAKE2B 11af1697135e424eec2e9a719f67a747e3888cf9e501fc65b99ef1eff28a153b47dc5e827792197dc9a19d1ff16c03a8c0b95ce44c177135ce44452ae3e097e1 SHA512 0b355562b481aebb7daf0940cc5548dc33e8252ae39e8bbd811f957f6253aa481c0fd02fefb7b30672392af50d5aa69731767915d47cbf83b71788cf8f5a6144
diff --git a/dev-python/tenacity/tenacity-6.1.0.ebuild b/dev-python/tenacity/tenacity-6.1.0.ebuild
index 5050891c0b9f..05b617276645 100644
--- a/dev-python/tenacity/tenacity-6.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-6.1.0.ebuild
@@ -13,13 +13,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	virtual/python-futures[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index eb630acb89d2..f035f84782e4 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,4 +1,4 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 EBUILD termcolor-1.1.0-r1.ebuild 475 BLAKE2B 22cc3c6d5bfe233579be3f44a51f34567db13dcc68ada17b56ee28e162fd2adf25b92668f54ee51719e81801e5fabc2a0d43835e5f1eb341fc187578700fba17 SHA512 ae2cf2e300345dbb07220e333c881083d4daa88ae4a002fed9552c860bd8e1d214f04109f706a51b76e665178c8c8e14cad9897b2dd8536a569544413f99dd79
-EBUILD termcolor-1.1.0-r2.ebuild 518 BLAKE2B 9e9f7a027441fb6325969aa0e3ec726ce1ef05cb4846dcbb8c45a97ffdbecce8e97a0193a081474b1dfe4cf029857a566ec38c99ffb0822f028ba34587b024b7 SHA512 91f49d6bf37969f58891e113d46a816148ad2cef66c4b68eedafab92b6f7051e7acd1655c3879966b512a99b67e80513e648bba6d8a7fc889c81344bfbae080c
+EBUILD termcolor-1.1.0-r2.ebuild 516 BLAKE2B 429bd57f73dc7ae32cff77d8b587cda2f2277447c467643884f17ac5148c9a1f70f1b1d7ef108c67728402957562e08d0cec19841b3e563432ecada4c6779311 SHA512 738085ca4b3e458e21b03fcafd897d87a16e2ace2e9970d93c099183bdd3baa5b87b393404db4eb477e6c4d4301af754361983822b75256101e5050b29a16613
 MISC metadata.xml 443 BLAKE2B d66fa2b33b0f2a854f6293896d9f94905112f9b10cb7bf5f7c5e5d5b2e5523a86523ce83078f1f386f5781ce6cd5ab183e6f8241d72c88dd389760a1b126cde5 SHA512 029e70f455d0ccd6aabe54c2b96cb3c0857fac49d23ea28e0885ca30fff829d2de2f93345de7e1fd14b46eb065b278d8b3f7047156b52feedd7a07df2d162864
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 66df011a2aa2..99d4ad02aef2 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index ae33539656b6..33a53f75074a 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,5 @@
 DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
 DIST terminado-0.8.3.tar.gz 21165 BLAKE2B ec031cb7828840a4f299aa25de0030d5b7993119fd41b71e698dd032f4fd31ea725a9b610dc53a71d480ee74b49a1d072d76555b434da4f5fee2479efa03fdec SHA512 441355cdc919b6f04b1bf1eb870f24e0bd6c7ef412e72e1747707049b1fa0d6676644e3646007f2653b3df00e1f30048d9dc40d73f0827b2bbfc0821549e140b
 EBUILD terminado-0.8.1.ebuild 708 BLAKE2B 4f33b4de11fe0adb4bf493b397f3c5d037d50a9eb8239c8f1459832df54c3570ebf977d61775949358ba3442449c125b8c1ba5de9e022309aacd44ce587a81e7 SHA512 9ed263651d5291e4853b1bacebd4f9f7f5c0845ae9eb0d962af3fc9fb6f7cefde838e5bccf3ac507c38c679a2ff64ecd74c2c19a396d1834fbd3b0ea998c6dc0
-EBUILD terminado-0.8.3.ebuild 711 BLAKE2B 149ec5eab916d64f35037b6b42ab8487f180be8f2031b58f58bcc7890a79b6d3b28ffca694112a396eeadd5750d682b92594f211e1f7d8e72f1e7e8ef4361967 SHA512 baea5df16f6cda7024f852b5f9ffa02e1865d92af42689ca10c5eab6b005271709c60f4f5902d771ad39e4c01b7b3593077e70f3c4ed4102dfa429488a16c437
+EBUILD terminado-0.8.3.ebuild 743 BLAKE2B c657f8b321f29c4b74966bb537c6b3d78e3be2bb1ec3ee9fb03b549211c39957909b22a29f658cfa3a7f449ce6cd0aba3546185c6a1d29156141aa1cb4347a2d SHA512 66e978fb915aba8154b109ad2c7fa147e4dbb8c36c9fd07ff7737fbf732da1f415a8d702cd6f1818be93e175c54a5dd82ded142b15aa2190d7aeb2e27a327229
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.8.3.ebuild b/dev-python/terminado/terminado-0.8.3.ebuild
index 8088786d9bb9..9b0ff3d216f6 100644
--- a/dev-python/terminado/terminado-0.8.3.ebuild
+++ b/dev-python/terminado/terminado-0.8.3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,15 +15,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD-2"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	>=www-servers/tornado-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	www-servers/tornado[${PYTHON_USEDEP}]"
 
-python_test() {
-	py.test -v || die
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_max_terminals:_&:' \
+		terminado/tests/basic_test.py || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 2138cd16bbd2..0386e41a5706 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -2,6 +2,6 @@ AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 EBUILD testpath-0.3.1.ebuild 1110 BLAKE2B cf610a2cc0a3b6f03e04fa6d5f36333b7253f8ac23ef4b3956fcb5d47dfcd18a62c9fc0e9ca863b64b66b4eb91ce8f7e23c8ac8daa00756c5cb741285d5c0c34 SHA512 adc56e47ba88f4e4275540ca2aca4c674a6ad6e61a491b8e2e523f52cf6fb45e5a7d56a9a661255490dfc5ff95e5ac44969748f27327688b057f550f759ec515
-EBUILD testpath-0.4.4-r1.ebuild 704 BLAKE2B bbb158880501f947aaf30fc5b744f8e9d31231ac325788202e80399dd4342d4b7b133f5547ebd7810f218085ca0765fb8638613bc00af667bdb6148a18959394 SHA512 aa9d34092d14fc6db5aa00cd8193bb39f8caaf763c885ce865c0909687907c3133b42cf9cb454bc52ab9288b57a73230823460a7a226c1d06b6a48b47cdeb3f4
+EBUILD testpath-0.4.4-r1.ebuild 711 BLAKE2B 7f2a9b92b81f48cf54b7f726fa46b1ad79cefa3072216d5039b7e9eef0baef9a308cd323203a96bc520e61a4c779cb7bf5255a95f240332fcae72c089ad412af SHA512 e3bfda4606161759224486ce93479293df9f80523be392447def9116504ac864d02aa9887d76e7860c8f4af8e30b0e49899d44b0ee103cef6ee40da7b130738f
 EBUILD testpath-0.4.4.ebuild 896 BLAKE2B ad48594448f494d44922e12414d24a5930f8592d7f3df4ea90d4b00ac9a9aeef9db3b05dcda811a08c59b3b9e0f3eaf84cda85dc7b4dee03f3e57ae6e0e184a2 SHA512 734740462be1834f515151d6558c203e1f0f63be2e2545ef11937f845b29ce312e6df239f679dd859973f80ae746c45d161295db04084ed1e72df033530c9475
-MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
+MISC metadata.xml 720 BLAKE2B 93bbf7d182fd5b9bacaf1da0044d0e145c14708a33dfc25aea2dd4c711e89848e0f2165acb98afb4ee383c01f8ff8d04233815169331047c0b8d7eedf25a244a SHA512 f4efcf08f277225e352339bb48104fdb33326bbd43c8dfea6f77f57d51f48e4e2b0657099fde91ae5f12e0ad661d10a6ac480b6e7dfce38c8d161dc88c163916
diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
index cba9cbf64b00..b65b36caa561 100644
--- a/dev-python/testpath/metadata.xml
+++ b/dev-python/testpath/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     Testpath is a collection of utilities for Python code working with
     files and commands. It contains functions to check things on the
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
index e15edf399209..55d67c8608fe 100644
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ b/dev-python/testpath/testpath-0.4.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 9922d6380e54..cd2065657b1d 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,3 +1,3 @@
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-2.0.1.ebuild 990 BLAKE2B 742a9a7587e207d4a8f28ad48cb7c23ac3e4e477862696b62091ce7b3dcfcf30340b6be6cee18be06117c54ba97db7b48d7a7102367ef63df96e1870c7eaaf00 SHA512 8ac43de085bf8177cac1a99df7f48c75b3d4cb3bd0a44b5eb641539db39c56d3ac18be689c9b6943b1cd162f38a2965ebdf9df325f1abd9fc16946dc02afbaef
+EBUILD testresources-2.0.1.ebuild 938 BLAKE2B c18057c32b0bbd0e81312f6426ed4111b88429da553c5574723f735aa0876da9d7bae188872dcb13f83175192704c07cb65c7899bca4e9891fcaa4650b119093 SHA512 a46f3d8416b77e67d32cbfd7754871e0a75b8a6da86cdec4ab6f57f5eb9455d5d250f592fce5aebbd63fc0e5cdd670a948d88b0ca79fc35b458d2dc1a9442646
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index 9b480a2aef84..2656fe9e2c07 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -17,15 +17,13 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
 		dev-python/fixtures[${PYTHON_USEDEP}]
 	)"
-RDEPEND=""
 
 python_prepare_all() {
 	sed \
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index f85e65d0e692..a458aca9310c 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0.ebuild 1019 BLAKE2B 3f09f25801c5e81b4b8e0436d4e1cfcd208d153e7280199f09f1520d1c9a6e860ab208dc314a199bba6ddf56bd80cef316f71ddc99689653c876b0ecdf8ff02d SHA512 36fd1decce77d4a9d32ffb1c5e943f267a0e3bc48019205a3423e94811ab00aabdb3111c4483b74f4b0251df6d26e114a1df1440b61b9e92a1d18385e8c0e74f
+EBUILD testscenarios-0.5.0.ebuild 882 BLAKE2B 697120873b6c2ce48834a732ed9a8ee5094f5366747af285966de1e4b39a33a8da5635ed582ea98e503df2635379e5de12ae8dba6933938c939d02070e1f7ed5 SHA512 ca59285e82dac99f317fe2eb8a5beec4ae3cae3d9ba8d3d3ea41d114939785ba14805f0bfd94d0a427da635c66b58130c4202970151ba4c494698acc4731e0f7
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index f81da08e2c7f..4c2e3e972ef6 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -22,17 +22,12 @@ RDEPEND="
 
 # using pytest for tests since unittest loader fails with py3.5+
 DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Remove a faulty file from tests, missing a required attribute
 	rm ${PN}/tests/test_testcase.py || die
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 74c687c45bfc..570c291b4a72 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,7 @@
 AUX testtools-2.3.0-py37.patch 1740 BLAKE2B 10a1e774fcc436b1e4f33075f807ab70ec79a7d16338cac35f63dbeaf4ab4f95d5f67c69886918405edb7ef939b9cbae00176202705d08a9f1ea80f08c3c6af1 SHA512 e8a441464b8d6e2a75f95b26e83c2b2fefad262fa193bf088b65c1101fb34a9d53ee7a3554cf005519a44cc007f78df74d32163e5910f447318c2e89e67529d3
+AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.3.0.tar.gz 231559 BLAKE2B 6ae098e368cabc0bfe45736324819687a6086eccf868de7eec312caf7c64b5d75a3168f3966d5cd0b05ad9295957a7aa1ee3c1589f076de1f5cb619b197ba08a SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64
-EBUILD testtools-2.3.0.ebuild 1518 BLAKE2B 22088b93e187496b5864c04f453d947e92a6a573bc2e004e9358de048bc23fd811909ee642696e16719bd2b8537368cdab53bd0bab6d69796d9d3af0520ea8d7 SHA512 11bb521cadbfbfc4ab8d96a093366d4b51471b34f662271a6e8e0b95adde303d5b905671d4a0cecfdf32db291d18acca4ce2c0f93d620c9484bd8064349cecb2
+DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
+EBUILD testtools-2.3.0.ebuild 1525 BLAKE2B 3019cb2605fa41e8031a9214b39014114f10fabc7ef52299f3ab0a2a3d07279bed44d345a7ad0d90bc084775b6fb259b6d01292eae989adfd1d7b279355510c7 SHA512 dceeb6352bb3a62a2c14dabfbbc9521e56914bb4e41115a05f7dc2717b86c49dc33eb2001c6e6b5ddc0a1b3da90da571081629e821ca857874bc5db1de32b53a
+EBUILD testtools-2.4.0.ebuild 1257 BLAKE2B 5f8afb462a79c58e6cb6fefba2833f8147f2b2035118c57250df0ab3f7bc3a0f61538718ea63544335c61fe6454542f5b7492ee7abc2c23f3c94186fec37f516 SHA512 18e04ca6c6333410c103c80d5ef9e780cfe35d3cb2df02ef771d1e4ec5163ed2bfd2cadd9a5dddd862de83464ede20e67a04521b4e9dae065f65b8d19e0dc9f2
 MISC metadata.xml 554 BLAKE2B 251f32aa81267f470d8f5d1f22bd2e2354fc39ec79ac326dd64333e73e5cc8ab35d6633e1ebce2bad5086d55f838fb129d7cbde2e1d36cf77945527e6e786157 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384
diff --git a/dev-python/testtools/files/testtools-2.4.0-py39.patch b/dev-python/testtools/files/testtools-2.4.0-py39.patch
new file mode 100644
index 000000000000..a502e1cc0630
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.4.0-py39.patch
@@ -0,0 +1,76 @@
+From 1d698cf91cb2205aedc018e465a2e17c5a6a3e94 Mon Sep 17 00:00:00 2001
+From: Michel Alexandre Salim <michel@michel-slm.name>
+Date: Sat, 16 May 2020 13:21:38 -0700
+Subject: [PATCH] Fix syntax error test for Python 3.9
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On Python 3.9 the zero-width no-break space Unicode character U+FEFF
+does not get printed in syntax errors.
+
+See:
+https://bugzilla.redhat.com/show_bug.cgi?id=1831126
+
+This is reproducible in a virtual environment as well.
+
+Before:
+```
+.venv ❯ make check
+PYTHONPATH=/home/michel/src/github/testing-cabal/testtools python -m testtools.run testtools.tests.test_suite
+/usr/lib64/python3.9/runpy.py:127: RuntimeWarning: 'testtools.run' found in sys.modules after import of package 'testtools', but prior to execution of 'testtools.run'; this may result in unpredictable behaviour
+  warn(RuntimeWarning(msg))
+Tests running...
+======================================================================
+FAIL: testtools.tests.test_testresult.TestNonAsciiResults.test_syntax_error_line_utf_8
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/home/michel/src/github/testing-cabal/testtools/testtools/tests/test_testresult.py", line 2744, in test_syntax_error_line_utf_8
+    self.assertThat(
+  File "/home/michel/src/github/testing-cabal/testtools/testtools/testcase.py", line 499, in assertThat
+    raise mismatch_error
+testtools.matchers._impl.MismatchError: 'Tests running...\n======================================================================\nERROR: test_syntax_error_line_utf_8.Test.runTest\n----------------------------------------------------------------------\nTraceback (most recent call last):\n  File "/tmp/TestNonAsciiResultsblblh75h/test_syntax_error_line_utf_8.py", line 6, in runTest\n    import bad\n  File "/tmp/TestNonAsciiResultsblblh75h/bad.py", line 1\n    \ufeff^ = 0 # paɪθən\n    ^\nSyntaxError: invalid syntax\n\nRan 1 test in 0.001s\nFAILED (failures=1)\n' does not match /.*bad.py", line 1\n\s*\^ = 0 # pa\u026a\u03b8\u0259n\n \s*\^\nSyntaxError:.*/
+======================================================================
+FAIL: testtools.tests.test_testresult.TestNonAsciiResultsWithUnittest.test_syntax_error_line_utf_8
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/home/michel/src/github/testing-cabal/testtools/testtools/tests/test_testresult.py", line 2744, in test_syntax_error_line_utf_8
+    self.assertThat(
+  File "/home/michel/src/github/testing-cabal/testtools/testtools/testcase.py", line 499, in assertThat
+    raise mismatch_error
+testtools.matchers._impl.MismatchError: 'E\n======================================================================\nERROR: runTest (test_syntax_error_line_utf_8.Test)\ntest_syntax_error_line_utf_8.Test.runTest\n----------------------------------------------------------------------\ntesttools.testresult.real._StringException: Traceback (most recent call last):\n  File "/tmp/TestNonAsciiResultsWithUnittest_zzswpmj/test_syntax_error_line_utf_8.py", line 6, in runTest\n    import bad\n  File "/tmp/TestNonAsciiResultsWithUnittest_zzswpmj/bad.py", line 1\n    \ufeff^ = 0 # paɪθən\n    ^\nSyntaxError: invalid syntax\n\n\n----------------------------------------------------------------------\nRan 1 test in 0.000s\n\nFAILED (errors=1)\n' does not match /.*bad.py", line 1\n\s*\^ = 0 # pa\u026a\u03b8\u0259n\n \s*\^\nSyntaxError:.*/
+
+Ran 2627 tests in 0.569s
+FAILED (failures=2)
+make: *** [Makefile:7: check] Error 1
+```
+
+After:
+```
+.venv ❯ make check
+PYTHONPATH=/home/michel/src/github/testing-cabal/testtools python -m testtools.run testtools.tests.test_suite
+/usr/lib64/python3.9/runpy.py:127: RuntimeWarning: 'testtools.run' found in sys.modules after import of package 'testtools', but prior to execution of 'testtools.run'; this may result in unpredictable behaviour
+  warn(RuntimeWarning(msg))
+Tests running...
+
+Ran 2627 tests in 0.492s
+OK
+```
+---
+ testtools/tests/test_testresult.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py
+index 3bbd8937..deceb07d 100644
+--- a/testtools/tests/test_testresult.py
++++ b/testtools/tests/test_testresult.py
+@@ -2741,6 +2741,9 @@ def test_syntax_error_line_utf_8(self):
+         textoutput = self._setup_external_case("import bad")
+         self._write_module("bad", "utf-8", "\ufeff^ = 0 # %s\n" % text)
+         textoutput = self._run_external_case()
++        # Python 3.9 no longer prints the '\ufeff'
++        if sys.version_info >= (3,9):
++            textoutput = textoutput.replace('\ufeff', '')
+         self.assertThat(
+             textoutput,
+             MatchesRegex(
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index 0ca5634cedcf..d7d7f476c5bc 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
+	dev-python/python-mimeparse[${PYTHON_USEDEP}]
 	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 	dev-python/pyrsistent[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/testtools/testtools-2.4.0.ebuild b/dev-python/testtools/testtools-2.4.0.ebuild
new file mode 100644
index 000000000000..41097304bed4
--- /dev/null
+++ b/dev-python/testtools/testtools-2.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	dev-python/python-mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/testtools-2.4.0-py39.patch
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index c4e924a13033..90c4aea170fe 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,3 @@
 DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93
-EBUILD threadpoolctl-2.0.0.ebuild 606 BLAKE2B 87cca29bb74e1d5eb93999547e4f610b17ecf4a5d04addf114a0badffba8abc5d13487f8e283977d4f8f56d2a9445d20fc8654f6b34d1559ac5cf1ad9e16915b SHA512 b66fcc4cf428ae1f6cb9b0f5367bbf0ad55538dcd91f02972074e82e68b755202276841c70d9d157e31aa4ecacbda057e001081d74c8170e0f29e9eb402b9746
+EBUILD threadpoolctl-2.0.0.ebuild 613 BLAKE2B b9f0b9c7d4822f8d05b558725f3a9bada8c93bca0aeb109960de0c28472deb6e13ac3083616b67717439713b73c2e7247d3b2253899e01967fa2e2cfa18166a1 SHA512 c6a59c29e709bf56ba4ae1cda0e496086215128e24982c719a42ae93555c80e6d6253c7bbe67888c10565577753e0f36b1ebc96cb39aa309cfaa8f203b4764cb
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
index c9be4d4756d1..7ef0aee87fce 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 5d87e2252823..f224a5339618 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,5 @@
+DIST toolz-0.10.0.tar.gz 49579 BLAKE2B c323bf1ba1da5c01a1a1d879ef545767b8253c906baba63a0f600d2879c5b7120c4978574447954648c23c22221ba05de2a2c7437eed1eeff31dface1c823f6e SHA512 4ed40c165462440c6004974d2515067f211c625bebcb69ea854fd8837e1fe05febc546215355a6bb9de5916c8ba98a4d297f8aa20e40ffbc8a730b2bb3831a71
 DIST toolz-0.9.0.tar.gz 45544 BLAKE2B 8de1702a38423f71ae6da24396c7a00428b13cef262efb0fceee454bf67a09a1ab4f4093c84c38234713b38ae4058c4039f2bfcb3c7286daba112e4eda23186c SHA512 f55a773d322b4ece104724c58d89bb41a35ec43f45b14fe367865934162ef06cf7da783b53498405552df75d83fba15bb61ce5ee0661b6122c5984352e80de3d
-EBUILD toolz-0.9.0.ebuild 444 BLAKE2B 1926e3799101001908a720f2cf663e932667f38e2b629be2916f433d61367b2cbb2d2afd8586d62642383983c90143a8c998b004cca02e8b4edc156c2f6c2a46 SHA512 e4a60bbffece1987efab8c7194ea1c3ce4db261ae27fb39d58eed5c0f778dcd8fcd8c4b22e236b70e4e7c5a4e3512c91e355986af558a1b319dd891cbb67580d
+EBUILD toolz-0.10.0.ebuild 426 BLAKE2B b6d68602f9608fa75768a95a59709964df0bc6a5b554dfdda838fa44f27a4aebb72bb221de4ee5985d37431481614822a4f3275318e3158eb27982daa6cbd8af SHA512 9d043f8a176507bdeff29963778f717fb8b7e2e99d1da3fac11a78711117df9a48198ffaf23ce211acf2913738815f88071a5bb6e12de4f11f7decddeecc53ac
+EBUILD toolz-0.9.0.ebuild 424 BLAKE2B d02fe615d0b64ed90fabb2c1b7ff269528492cfd4cb580f0adc2a5301d6f0df6365fcc75585a809a30e2875c54b61a0861715afd4b6cad1cc0f3d69730a7a65d SHA512 3b204f5a470c3ec28ce8f9a382ef56571faec4c55b011df9897016ddf5ecd346955d22f14f888b4ee2d87d075307e474712a169f7a57ea869af18a95dcc7a9be
 MISC metadata.xml 308 BLAKE2B 2f9bcec9b5e7f76a32f38ecfe3aaf74e6ee231151af12cd6c98671bd4fd40a31110c739e0dcc4d60a7413abf7d8dd268f244553e8b549a58bfb9cdf920b8fcf4 SHA512 06df1cb87c23af8446b55a5c3da9617686a03547ab9c1d4cbaeb53759f789961963ce947ccf559db057c01d0cebf8da1a37fe46da9133932717aabfb40a7e177
diff --git a/dev-python/pgpdump/pgpdump-1.5.ebuild b/dev-python/toolz/toolz-0.10.0.ebuild
index 208dd93f7567..79762e7e4cec 100644
--- a/dev-python/pgpdump/pgpdump-1.5.ebuild
+++ b/dev-python/toolz/toolz-0.10.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
-DESCRIPTION="PGP packet parser library"
-HOMEPAGE="https://pypi.org/project/pgpdump/ https://github.com/toofishes/python-pgpdump"
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.org/project/toolz/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+
+distutils_enable_tests pytest
diff --git a/dev-python/toolz/toolz-0.9.0.ebuild b/dev-python/toolz/toolz-0.9.0.ebuild
index 67bb2da757d9..0c486b0291bb 100644
--- a/dev-python/toolz/toolz-0.9.0.ebuild
+++ b/dev-python/toolz/toolz-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,4 +14,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests pytest
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index d5d980f5b799..703bc4bbe530 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 903 BLAKE2B 33baed6c7c42db8ad0d1a3fae8e926134e6d413effb4b95c78b520b3886a76583360845228eeead0870c4eba017a5dd613f1777dd7a29a31a2dba2c4123ceffd SHA512 117b6f5ee373bf89376557de5f9037b4668b84c74ce5df7d58e73efaa8ebe642eca132ae15bc2e4f09e98a642e0240836c275177cba5437aa6c0da57bef2ffb2
+EBUILD towncrier-19.2.0.ebuild 921 BLAKE2B 14d176c918a616af267ff8a2eee889f1c0da565e7c95635917bb9bc0f0c81242e144a4c1fb0c372c9d7b495c1e90c748337e6823f2aa3631acfedc9eb7b5395c SHA512 b8523784d3dfdc99a4252046177cfda3c4503e77a5525c63b3c740ea830e678343dc08d65b1079acdd2ed840bcc20d75d3f455d1578e91bc0a0ee833aac45139
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 767f0931e040..7c6b2b5c34e1 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 6e5578117dbe..43d3799ae622 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -6,12 +6,14 @@ DIST tox-3.14.4.tar.gz 289600 BLAKE2B 413782a524b70b4e301f5a4bda9c763dc7e670d7fe
 DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59bd7d909361029f30e407ffe62a24967e5a447cc643500dfb61326d47fb276bb669311780ac49aa2075fe09 SHA512 cbd0e4c53bb82a302016f380a246e9a9630b8f0c6631195af2dfa12c090cc76c3d9da8362e11c42e74bacbb3f9be504eb67e07de1d2cbac7b5f05341ea2970c4
 DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62e82eb8a8bf10da291b4868b1fe319e38a583bc67bb26ab868b8a123feccd5bd008ce618ceb46d3121c68d2 SHA512 cb21574301d953b361eb5e1d89eefe22e68ae5871036f03d5753ee97c888cadde548d62a50622dd65b3c488143bbbdf8d309bafa3b6a4807871c9e78b6fcdb9c
 DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
+DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc474ce73f77b22ed8f73593a3ec7ef002e1b415798024a6451ce8f85f7c9dc03dc01b3af392babb2ef3524 SHA512 730680951dda514c0b228f7f37b06537ee44893a0fc0dd812954350f4123519514b07a7394b83243c267c1e05c5c0917efe6c8ea1b04c11418a2f997cea38878
 EBUILD tox-3.12.1.ebuild 1470 BLAKE2B 328809a7f1aac4a932586a88ac9082a83f8f5aa66b09714747584ed6d4acb8ab18480d2da58d7b74992633ccda2e223214eb871206d2a1531de97f5165f991ba SHA512 3e3f7bb27056a9e5bbaf3c699b1618bbde793518aed71acdc639e4f7692417b23e669c79f9737eff6e21ae255551f6cc296519cf85c28126e897a8dfb414f6f4
 EBUILD tox-3.14.4.ebuild 2249 BLAKE2B 4a8e695a7625cfebed1fc86451ceec4459673d31385a3bc295bd311e5c9c045b86b4b5b6577bf6ba6fb4b2f142812dcbf8003a53668a1035c964d2c2c68f16f0 SHA512 10d73cfdf517bc0726ee19609134914bf8bdf3b79dfae810e7eb9ac3c7e9713b8a2da28e7927cbbba8da571fe56a9d8c4b7767ad4b22d88d97f92770167ec10b
 EBUILD tox-3.14.5.ebuild 2289 BLAKE2B 987bd969cf8477bfa0436717e70915918f1d97a2149ff1cc9f76df58d8f105ea959f8f50f2a684c09ea1613281e294694aa7f53c2992124c89e12f78261f02c5 SHA512 5e7a92de1f17558593d06f417b4d8655c20308f8d0af92ceeaf6570228835d53d3592c9183f9a6fc1f390dd3f6e2f3f63cd03b4e52677101a8166ca5efc7165a
-EBUILD tox-3.15.0.ebuild 2283 BLAKE2B 1062d0d123cf5881a018766371874f7dff0f954b6d660ebff7d0a7f9d3e1b08ef6f1d021b9389187c6acbeb8489d8818eb4d0498033a6243246a3e023fb510c2 SHA512 f0fc337ca5aef51f9e0413c73572c5988d0b0b8f25085c3274a45082f20464997b2b1c12a239f96a207800cead7ecc1877813eb5a64744eddafd6d1b49ebcea2
-EBUILD tox-3.15.1.ebuild 2195 BLAKE2B 1e2272d3b74b2e67b7e95965f8179fa7610d621db574613d678b5beb58e59fc747ea0d8ab4e5d767bb9e926a0fde48357afd6f8286b4113f23815f5c3252e7ae SHA512 de8134be84a0b87264a66098a10666d3fc4a38c83f21af4a0848ff680793408f19ddee567b944f8057abea08c36e505012b396851021aa908072ef55349f7446
+EBUILD tox-3.15.0.ebuild 2280 BLAKE2B 9a813c89fdf90197b265e4c9f1f2aa2cf817122c4edb9b41606e35368dcb9b24f8e105d8fe04b5a90fbc6be2dca7fe05d8470983422da1cc780b668c0712a09c SHA512 806f69eb7a848de87fe9f45a7ec538c21f3f1d6a418d84f59b0181d1a6c6764a9ad1c5383e79e815aab04e93aff1473b8ceec5f31a496d3223795405e2daf364
+EBUILD tox-3.15.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
+EBUILD tox-3.15.2.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.15.0.ebuild b/dev-python/tox/tox-3.15.0.ebuild
index 17f2cb7f0ce0..d07fe2ed8a50 100644
--- a/dev-python/tox/tox-3.15.0.ebuild
+++ b/dev-python/tox/tox-3.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tox/tox-3.15.1.ebuild b/dev-python/tox/tox-3.15.1.ebuild
index 8d18f6512c45..0365e6a79004 100644
--- a/dev-python/tox/tox-3.15.1.ebuild
+++ b/dev-python/tox/tox-3.15.1.ebuild
@@ -42,6 +42,7 @@ BDEPEND="
 		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
 		dev-python/pathlib2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/tox/tox-3.15.2.ebuild b/dev-python/tox/tox-3.15.2.ebuild
new file mode 100644
index 000000000000..0365e6a79004
--- /dev/null
+++ b/dev-python/tox/tox-3.15.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 08a30a61171e..48148ccbf0e1 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -4,10 +4,12 @@ DIST tqdm-4.33.0.tar.gz 121571 BLAKE2B f4ee73cfa710462e148f6034ac69144d845d216bd
 DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577fb18986e3153badd73a28352f807782759aa52ed082d7ee0c13dc5f850c1da563ee5892f6bf5e8f49c48c7ee SHA512 1c326d98130c79f614cea502723e4202baa57b7b4639e208133cb464785e4a8d4eaa9d262ea484246d45e5eb8f21994e7ecf3fd6ef0f4966f9049fc8013d7442
 DIST tqdm-4.45.0.tar.gz 140990 BLAKE2B 8699b3a820859406e9bbafaaa48ba1b418e3083898d2b6c3401078996dd03431db259d5ad8a377226a50b80513ef0fc55bdaf2b67fc4a2bdd490bc5fdc04d681 SHA512 7b35f86205c6581ede9bdb0788e7f55be525c3f0f77952803046661c6a7a6cd3c15ed0323376ecedb5cddace1b32a41fee1932033dcaa49f9096dc3b9b674f10
 DIST tqdm-4.46.0.tar.gz 144312 BLAKE2B 93b902d9a362e658f244f3c1b15a3496425cb3e401adf291dc0a9c7c0bd551baa1171a753be8d1c3b877d2cd3ab25e81dddbd8492668d0b0f6ca3cb47d13be1c SHA512 ccdfce4d273e78ced172fc3edb24ac038465169f7b765e7bf779831ef3d0dc72c648c5fb165aba02e0c6dc86c5d0ea3d93d5530b642ddd84e3d284c7354739cf
+DIST tqdm-4.46.1.tar.gz 144383 BLAKE2B 4d72bfbf0c225c779ae2c9bf405f9effdb69cfe7862325b12e8408c17a03b7a87f9cf0d055de598a67132861114c89b237d0ad2509302e452cc67ce9aa34fa48 SHA512 de8710ceb44b6caa073aaa3c9dca281880d752d1b542a3dd87a54884478a185c35ab1969c6cb7242e30ee0511f967cde7bd4fa83a8d4f8c58d3e95ad2bf3bfc6
 EBUILD tqdm-4.23.3.ebuild 673 BLAKE2B b49a8fdad4ee136a4b5149ab39a852d748c0a9f357587490fd272d37743ce530ed2b69fa8cd87a8ed657d26c0669c2e038d484afb7279ec3460562d281b0063c SHA512 2eb6fa8f796289073d92c07b6e7af8e7441d83bd32a01ac2a0d3dc8b530d1c796777ead4502cc6734b81adae01d8c0a496bff147cde268fe2d5223c4a8ad448a
 EBUILD tqdm-4.33.0.ebuild 1233 BLAKE2B 06c019bae07709c13627ec3b47c00c2745041b604d15a1f84445ab82cd82990506a61ce6c2d44cf9d84c4b1b2c5772ee6b03a4252af7035ac33fc4e6816d5ca1 SHA512 007d81a3e948d9b02e57a501d96ee8bfe8763bdbe5fa89d21332880873dc459cf184f3ffc3a9edf6b2b8b46933ae45d1e07b32b649c8d5ba15cfadf374bf2814
 EBUILD tqdm-4.40.0.ebuild 1350 BLAKE2B 27dc08ff9bdfdb52222d625e442202eed0f2673a3e4c7e2640f6ab113fb5da118616bb08b69f5050eca5c17dcd6bfd1389c4dd17b7c8b20fd137e69c22b6e5c4 SHA512 b81e0ea43e76d9d3ae9440328d69c6998a3f76f788ac68be9d4ca81051ae9b15d0ba6b3cd4af4c02144ed781e52cb28de009bf03445f6a9810039380c480dc1b
-EBUILD tqdm-4.45.0.ebuild 1352 BLAKE2B 252d0d5584770fddd243dba8750b8fd1208f006082ca320f4c9ec778712a9a55b5d77f0a1169557b8cbf848bdd28d4f05d40979d260f5cffa145c2995f685800 SHA512 e507e23c4a6bd7484db91648443e805f3a1cf0c0a1ea3e427fe348284ac2880a0a3bedd0c0e2f3bd28a556b4cced1daea717e14a864c2667ffe4ac50a8758558
-EBUILD tqdm-4.46.0.ebuild 1359 BLAKE2B 7d2c0fb8e03c2517569bd649ae76ded9d49a966bb5c992101c22bdfb01b2f0afdea0f5495940b336186f39a6623570e157b63119e82690f6572ef99faa7ac39f SHA512 a109333199cfeb659f9e1c8cbf3eab9748c032b98d487c9695691a292550cf17a10576169ae1a2f43502ce4c0a41890e5493f3c6892f3ffca543340fd4389549
+EBUILD tqdm-4.45.0.ebuild 1357 BLAKE2B 61a3712f9a48e6fdf639f3a93e98f45d8252fddf368a10047e29c88a8041db391d6a196642b82bb5afc8bea5329e0f178dbec286b0a7b3fce9fc075ff687e9f1 SHA512 6cc9c993115b72a3e91bc0cf135d67e166de30f538a503e2901b01648805012056d4326444ff56f4fc6469b61aa1fb9a3eaa856a64c268649235945e3efc8e9f
+EBUILD tqdm-4.46.0.ebuild 1382 BLAKE2B 4c22605d67ffa9f686148c836e55d696adf92a9c8ef16e5c6aeee371b5f232996673a33f179638b429e1ebb2d6870cdc6b4332ac5ae2eb4e3b5b522c062d9d7c SHA512 312a694be69f171f8b07be4c718bdd1955c95366b3adbdc16de2694353b1d2e92b68e948add38bba57092a8bada6d25bebb90b7ad289974d86278da1d727fba0
+EBUILD tqdm-4.46.1.ebuild 1333 BLAKE2B 73d52d1f1d6361229e073efef1f1b32f42c86bfb157d32390e4b771ccd7249c02f45080334b0e31791553192eef4808801bdd0300865bba4594a2fcad52b6ef5 SHA512 198935fef5bb0ae4d30611fa98554e80c4e9b397b688e4c283e3a1d0e181fb5e0e96e89c88f48010b2334ec98fa8a140d056a76e1d3746e90ef77e4f47184806
 EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
-MISC metadata.xml 702 BLAKE2B 9e1bee8f377d18a7fddbf5a7f061b4682e28d726c4e18fb79d243bc280f01fb04d4c7743ccb380142479c0f387892358dcb76d13f659809b508160bb31096d57 SHA512 1fec7bd9cfdfe79f99141c0af20bd5da2d2d36f90a159227f48cf8b3bc8c87940339274531d62fa9dd42da54162693e6a4c74fcbe267c25a32da9cba7745c6ba
+MISC metadata.xml 803 BLAKE2B 459df7dc960e21c114e5e688d60ade18cf4e2280fe7a55794d7097e8371c6daf3cc0bfad74ddf418684e2941ca97bdfde695e1398fddedbea10c65d962a1fec2 SHA512 673f0bc8c48f3d0c24d79304e6ac32e8da06d3004fdb7bb57f0b2db93ec555f9237812a894290b0999152e7fd5e1baadb43f45e0835bb6da7b2ca98f2e3aa85e
diff --git a/dev-python/tqdm/metadata.xml b/dev-python/tqdm/metadata.xml
index 774ecb60a212..d109a0ebe957 100644
--- a/dev-python/tqdm/metadata.xml
+++ b/dev-python/tqdm/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>
 	<longdescription lang="en">
 		Instantly make your loops show a progress meter - just wrap 
 		any iterator with "tqdm(iterator)", and you're done!
diff --git a/dev-python/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
index 2735812d4e34..6ec5bce83c37 100644
--- a/dev-python/tqdm/tqdm-4.45.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.45.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.46.0.ebuild b/dev-python/tqdm/tqdm-4.46.0.ebuild
index 2273ba0de862..0c1a502ea5fe 100644
--- a/dev-python/tqdm/tqdm-4.46.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.46.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.46.1.ebuild b/dev-python/tqdm/tqdm-4.46.1.ebuild
new file mode 100644
index 000000000000..75999c0d5faf
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.46.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index 208fd80c6c0a..b6f1efdfed15 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0.ebuild 606 BLAKE2B c0ef9a4bd1974574806152751712a8cb32c4045bf28521a626bccce50edd1f86beafc0a62bce1ce50e92f20029ec33357ca3069a9300b7e51202bd9980b3b551 SHA512 b4b8552710157c4eebbe1c8cb74752e16735db5fbf1627e712e5295794a3e083f25443c78456b1ab6ee352cdaac1336473b9b0cfecceeacaf6f3d93091b201ad
-MISC metadata.xml 302 BLAKE2B 97962b0a7d9fff03c6bf59aa6b2702faf2153df607b896ceb41e6eb7886045b9180048b121102caee6229950711cac23acec5bfc72771b112fcac0fa59536dfd SHA512 59c7be20af309b3258f6d3208da4956963e89c47ac2d15b68c6917d5d33b9aecbb359111579959fcbba5c5abace520ab7181e1e993e015f1d1971e1f5e4a3564
+EBUILD traceback2-1.4.0.ebuild 915 BLAKE2B a83214fc7ea11c803a2698907f91fcf98fb39e30022793b3fc785cb39cff0b358ae23c30742604130caafe9b7f851a6ecdf2f82a19e80571eb0a2b40e0b28a24 SHA512 3bf65eed2965984307c713042fc871b6e8bc3e5f42faf6727372fb1a78c1937ec6c7422007770cbabbda71123cf3cfa62622bb625ea8e5feed11dcd46b524913
+MISC metadata.xml 377 BLAKE2B d9559b04f5b5494558e9441673f5f903a07e14d4f333a48c6b0091d1e254ac555f26d9fa4f48a794f197026f8683d80c7bd80020233839840cbf277bd72e3c9f SHA512 5323b19aa003404610d2ddfff36c8e7117412afa058486b02dc949e6b39a8a52dcad78aaec92ba62fed72f0dfe5ef501905ade41a3c018dfeffcdbc8ab9b6378
diff --git a/dev-python/traceback2/metadata.xml b/dev-python/traceback2/metadata.xml
index d819a58d5a74..34b72c8f590a 100644
--- a/dev-python/traceback2/metadata.xml
+++ b/dev-python/traceback2/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="pypi">traceback2</remote-id>
 		<remote-id type="github">testing-cabal/traceback2</remote-id>
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index 19846f5c3da3..e0ffb58165cc 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,12 +14,21 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
 
 RDEPEND="
-	${DEPEND}
 	dev-python/linecache2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# fails by line numbers on various py3 versions
+	sed -i -e 's:test_context_suppression:_&:' \
+		-e 's:test_format_locals:_&:' \
+		-e 's:test_bad_indentation:_&:' \
+		-e 's:test_encoded_file:_&:' \
+		traceback2/tests/test_traceback.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index d24e10f6941a..b4b5fced2c2f 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,5 +1,5 @@
 DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 EBUILD traitlets-4.3.2.ebuild 1086 BLAKE2B 8f7e815e49073c78b12eff632cf3e018fa9ee02bcb504e4c27c85b06118d144f7eca015ee29c95f6446639da5f9626234af19c74836c1bc7e12fbce272a4155e SHA512 d2276c8067b333b377e469f497e49519b4ea785d25d13fd16acc80067ccf60bbf291b791f7a3cf2e8ec25ea21d8c4646ea4adf6e89389daeaf8a99758b037ccd
-EBUILD traitlets-4.3.3.ebuild 628 BLAKE2B cd90b40a10bf806612bd6efc19c57933a39fe6edf9096c3eec37f72aca7d236ecca0d62de121b5bbc1416abf3f1b34de9852f1218d84ca01a14f6cc5107eeeaa SHA512 5b57e759724a6945e2888e1d33a1051e7000526aef2d316c19c454e1eead8e4d6f4896a5fceba7ffb4b2221d3a65a340853007daeb57956911ead413d13f156e
-MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
+EBUILD traitlets-4.3.3.ebuild 627 BLAKE2B f83ef7bf7906b2301fce2ae921c39aafa68206c9de727c127b93d6e0f88ffa375869649becec3d3601d62e8e1b3aa6c05adf87a7e2f3a38540d5dd9918bb9393 SHA512 dc314336e489de5aa0d629248c38ca72c09268f673b706879be634788e43dfe8f4413bd2bd8f0e52d56deab105ed07b9bb4173a4a393a3741dbc4bb8093fd7ca
+MISC metadata.xml 711 BLAKE2B e8a10398927e2f5dd1d51df84ea8d156f175c2d7f5a14599d154cb413263cd8a396cf037fd50e9adbafa96fcf4dc060d3073ec1c775443538ecc963112728951 SHA512 5b6aa6c0c602beb2cbf3c2b6fb5eb35af48bb1fcb1801f0cb7cc9cbc7645757cac4ab9e06c492705acc3e51ae6565e5124d97dba6be6b204fa58483c7ee42204
diff --git a/dev-python/traitlets/metadata.xml b/dev-python/traitlets/metadata.xml
index fa50e6184913..9c39adc4acfd 100644
--- a/dev-python/traitlets/metadata.xml
+++ b/dev-python/traitlets/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
     A lightweight pure-Python derivative of Enthought Traits,
     used for configuring Python objects. This package powers
diff --git a/dev-python/traitlets/traitlets-4.3.3.ebuild b/dev-python/traitlets/traitlets-4.3.3.ebuild
index d013bd38ca5f..aa50d4904df4 100644
--- a/dev-python/traitlets/traitlets-4.3.3.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 728c31672ff0..2e9f6e0aca29 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,5 @@
 DIST translate-toolkit-2.4.0.tar.gz 7646438 BLAKE2B 5d956ce05b57aa3ec2c7896a36f199cab5a590d4d6a4ad84263d7b757e35d5e42a40cac38ea3da1c8a11c64b1cacff5a5742b79ad5a87436842a35547d89e611 SHA512 715d9e974c451a5c3d92471287f4da8e8ba663efda849398f77a3c3d6f16e0c9a8e685261ec07c02ce9bd13f3766f0b2b1ad441b92116bb3913036ffbd415658
 DIST translate-toolkit-2.5.0.tar.gz 7679224 BLAKE2B 927b0dcfc0836ed2f2589d70f5789fc6d8b23a3e80bf4ef0054704ca12e4b5287a7e3b2a90992197bae6fc0acee1ea9d93a8eff05f6e5182f9269ca2aa9e5a66 SHA512 c4ff8fe9e7cc5b44a5448391ecbcfc454bf32d3794267e67824b020ca78cfbeba1283287a42f07859cd197a413fe8171ad5e31375f60fec77f334642ed2ad13e
 EBUILD translate-toolkit-2.4.0.ebuild 1909 BLAKE2B ae816dbf3748c3a794b5593773480b2886dc4637121f4d27776bc88e48a55013ea712ca88eb66716173a8ff16a340f679ee5dc70c88bc62ca76a40952dbb2869 SHA512 db6aacf34558c4bbbdabde084e53a4d5e67726b1ea54bed21fb513932e0f70c1716556ed9495fea47638b0bb8c6b445f97b1fd075fa983a808f9be4b38546f55
-EBUILD translate-toolkit-2.5.0.ebuild 1933 BLAKE2B 671b744e195515719851b9994d1afadda327c195b26a0f2508f4dd668fa5c072b8a0b7acef0d2dea8c19844b75b4e5a40b8aeadca2813f6a012ab3b75b6f1f1b SHA512 f8b38a801c00d6e4152566edf102e4abc23d636b6d7b3e508e11001fb29a612d362a85c49d9dffdf8d11d003643c0022910b8c550294b8a5086201ef57329dc2
+EBUILD translate-toolkit-2.5.0.ebuild 1932 BLAKE2B 8a10478aa9c51e009850027d924ce9ecc69a5b651cb2f8dd07ffd987337b8cfea2b0d960507e582a89eb297e6316f29a7a7b4bcb52460312df27bd01f2a4d03b SHA512 bd040475f5593a110104cc70c4afd53e5fd7a292b7c8e8a17ff9613100df33425f1b3c5d3591d0731c319edc3dda4f09c717564d4f6e81cd82a166cfb13daa4f
 MISC metadata.xml 666 BLAKE2B 8f550fcb2d34ecd84e4125645f127260c154022bd7cf03b7742313632627c207a476f1e4a98c83b5d5890beff7558ec548f16c675135822d790146c842bec04b SHA512 34bae48b0be0aa5ef195757bded33736a051ad563ceac7be514bee3b54c67637f308d7a7844fa0657bbb4bc6ad987bd3ee9b04d65d16fdbd6d5d7791e4bd155d
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
index 0686fe28f54b..8cb0310220df 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc +html +ical +ini +subtitles +yaml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/tubes/Manifest b/dev-python/tubes/Manifest
new file mode 100644
index 000000000000..9e0784ef3fc3
--- /dev/null
+++ b/dev-python/tubes/Manifest
@@ -0,0 +1,3 @@
+DIST tubes-0.2.0.tar.gz 64284 BLAKE2B fb8e196a2e68998e5e63c7c5e001d4b8baffb049bb4bedc8f8eb44117ab6a699e54a0dc96071cea8eec7db7a49316a01f6c259d2e456443a1014d9d4fc25d007 SHA512 6039a3059b61f8a0c84d4e10bb47d9f2bb95505b0353cb0f1eefb6942f0ad0d88c9b02ff0d48ed0300d615d3e3203c5e884990cd6d006c2f1dbd18b88fcb2e9e
+EBUILD tubes-0.2.0.ebuild 715 BLAKE2B b631cf5a2bcc4e73bdfa04ae3f61c01c3ea17e2ea1a3b9943137b7e8c62457940558725f4519278868482691b7b1f2ac047bab766bad33d0e43e8d84b6af331f SHA512 5664bda610efce9bb61adeff8a67e531230804773d09767c1156f92ff58e06526edee13d97401552493674b1bee9a3bbe6c7e2e5d248260aef51a965eb981a2b
+MISC metadata.xml 894 BLAKE2B b6180631eee31ff627a9ec598c98db018c8445bed530477b2c40da412bc61cace8a22073b1b386965a8817c7b25a976b1ab535f31d99279813e4a4ea0a7b5fb5 SHA512 1ab12e51dc2a38646f3a8ff334e5833a0e1673664e9ba26bc8d9f7b0feb9b69d0b32ff232ea363d804483c18a1b23c9cd1a8dd02a18b7f796db80f383ff55c09
diff --git a/dev-python/tubes/metadata.xml b/dev-python/tubes/metadata.xml
new file mode 100644
index 000000000000..77d7b556b447
--- /dev/null
+++ b/dev-python/tubes/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>bolson@bolson.org</email>
+			<name>Brian Olson</name>
+		</maintainer>
+		<remote-id type="pypi">cbor</remote-id>
+		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+	</upstream>
+	<longdescription>This library provides encoding and decoding for the
+Concise Binary Object Representation (CBOR) (RFC 7049) serialization format.
+It is implemented in pure python with an optional C backend and is compatible
+with versions 2.7 through to 3.8.  On cPython>=3.3 cbor2 can use a built in C
+module for performance similar to how pickle wraps the _pickle C module in the
+Python Standard Library.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/tubes/tubes-0.2.0.ebuild b/dev-python/tubes/tubes-0.2.0.ebuild
new file mode 100644
index 000000000000..6e7b2f17ad58
--- /dev/null
+++ b/dev-python/tubes/tubes-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="Flow control and backpressure for event-driven applications"
+HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
+SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 "
+
+DEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 5c21ed1e0181..2b53c12909f8 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -2,6 +2,6 @@ AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842
 AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725db39dc5dd555b4f87b468110e72b6f899835cf1dc3a129762bf9d162cff98e7453814cf917562c401315df3e SHA512 a3ed4afa3c4b4137e953adba6fd8994f95fdd7b5dac67a57b8f75247a78c09f59699e37e43fe3d38e9440d3ba41dd0713f6bed539538e521cce5501a80ee6d81
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
-EBUILD twine-1.15.0.ebuild 1293 BLAKE2B 4bbbc2f796e868998f0396ce15705832e279787d97bdf7d7cef7947567ae5c00a11409af19ae6321cc757a4eb6f128402c1a36e3635605485204e9294efc06b1 SHA512 7428100d995238985ccb2679aef51f9424836c74683eeb9ce46d99be1fc35ad7d8fbd70ff489967b39cc2c0438fbd057265af43dcf6355d83f25b9113dce4575
-EBUILD twine-3.1.1.ebuild 1794 BLAKE2B 5a31b59a7641cd38a10a648ab24e265d5fa20cad2231e5d2bdd5aadc5503692fd49b61c289038c7680c3a9fcafe7a53faeb6adbafeac05e3db06718206606dfe SHA512 f4b2037e8aa5be1b74399b9e27fcc8514d823870948d29fbc78db5a1881278dd0dc728e2ecad25c4bdbb0758dd9fba3272bd4d14bbe7a4cdb0b77e9251b71439
+EBUILD twine-1.15.0.ebuild 1316 BLAKE2B f3caf2ad608b788cbf8c221a52e192d4df24441a9cc6bde46131a44a117bc0e2300e507769a79945ab5afdff9d3ed3bd3fe8afa9611fab50561b9efe2c3a72db SHA512 4f55f1e3e359064f151a5975d5d28f45eac932a87a79ef7cfc9aa6aeceb5b94ce47b7da177fd8b3f78fded784b64501061308bf02fdac3a71acd495982640f80
+EBUILD twine-3.1.1.ebuild 1823 BLAKE2B e46de58b7fed306291dc6c7b534bb541911cd13ed5df63ac140673a68077240f4051569853355ef8d850262c0a228400b24962ec9ff268eac99b2a3d9d290fad SHA512 a4c0ea189edf18dfd23b4d45c6f354bfb1cd458613fe18f76bd94fe7160e38df2fa37932ddd1c3101948c0d08ace0369b7372b35610ef8cf67c58d9775def9e9
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index 685e99a4a62d..aae10c3dab61 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twine/twine-3.1.1.ebuild b/dev-python/twine/twine-3.1.1.ebuild
index e624686e3c04..adef323d40d7 100644
--- a/dev-python/twine/twine-3.1.1.ebuild
+++ b/dev-python/twine/twine-3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index b970e8d38e76..ca250b7e016f 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,12 +1,5 @@
-AUX test_main.patch 3035 BLAKE2B 849a8d5aa6014d8c62f2cb464265b2b0d2a2e11e58eb28803b06683e89acdf6ce8668b1b1beb36f1437684f26f57b94b840201f9f8aa3e34b37cf888e2cb6644 SHA512 8e85a2aeb934f9a85bce223e50bae62e63188b4a75f6ef9e67badd040a6018075e7c777683106cf160d65383351d2d6ce02d3bc9a57e434e6e120ac8b669b147
-AUX trial 485 BLAKE2B 5a8ac382860e3967b5cb2d3b30a3799d77525ad3010b19daf5bed693c5739149b4bef070790485585d1e0b13d0286e84196a3cea26d3646ecd8e36ed7f966eef SHA512 b6a58da5281e18306d558fd665acfff02e2478e4f692661a3ed0fc0b01e6e13794a8d2b56ac3f2790a0cdd83a882f37a247f5083ceaf6ed6686fb69bd87853ce
 AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb
 AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
-AUX twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 427 BLAKE2B 0bf2c34f6dce2eed84782da7ce29ce4a76f6cca3f3b4b273c16c02fc75b22df3115deeca9c836916dc43ea88dc08e3e4c2f544c50164ee0c8fae491b4e54befb SHA512 d14b4941c3a13c59dfe0599a3eb73b9b0d5bde8e7c26033848ac920da8e8c63a0290d7f4d711cab16a17ba55a2e13830ab02bbd0db38f0757768cb973000064c
-AUX twisted-16.6.0-test-fixes.patch 10591 BLAKE2B 27729db1ce4b84ea66acfa12bfdf2232623fa6c607fb1a6e0b3cd8325c31343a4565568141d9e659204fce9a2156117db05027cc2b023e8099fdf9e394524df6 SHA512 5071ffe30d1911ab4eb301403542f34198cbb3e09137d6260125fa61f702a0ce10e5c11c7967c10841a9d1b62f2eaf44e04119182a108cfbb7046622ddbdbcf2
-AUX twisted-17.9.0-Fix-test-on-Python-363.patch 3490 BLAKE2B 421318533759dad2d4ad3f054fbfab7900362aa3b3ca0adc75fb42431272fcaa40fe85ab2a3417232d97d3389b380ae658ee5b475e087f3a6097e28dd2094111 SHA512 0ba6b68267418bee3b2cfb15937dab4d6d3291725dd7acc41f37e0c8d39218acc4e23cb704c292f62eea57a128a1fcee6899826601b6763f37800c4b83ad18a8
-AUX twisted-17.9.0-python-27-utf-8-fix.patch 1630 BLAKE2B c70f3223b66a9372e07df7a767937d77a07f91cafecb4a5d84452f57458516e3ef17e4d5862d6b9f003e0edce3391e282f5bfcaf57ff2029db3c499fc6e97262 SHA512 635c498ab0e612b7d7ab262c333f18408e22dbe95d86389e87da36f0c41cee90f25b4c1df626cb755932c970a9f12dc25ca67e3790bd9c15c8a4d8ee6f547956
-AUX twisted-18.4.0-Disable-writing-of-plugin-cache.patch 853 BLAKE2B f2f4f3906266199856056d4eae062aafaa8d5b574858bd494d6a51512ad3f27ee0d813de8a760fbd21bdf479fde0bb1c3e724e13bddceb0d3af83bb8ecb31aa6 SHA512 e27a61855523a64c27e7adfe8ec917fae60149b1bfe0fc555694dc4321669665116046baa8f293d75b4bf68ec19743850062132aa05fed5feab4f582cc75219c
 AUX twisted-19.10.0-py38-cgi.patch 1356 BLAKE2B d172448bd2807dc57ac2a905427f0a91fa93dd17a1e58ab64dc17fc02fe05a81cee4c08aa667c799720cde33877e4b72f8db8df3587d8d8d711988bb2e388128 SHA512 65629acfc2f6dd6686db715024209e9ff12b97d5190c4377e6d88222c85c1d2a1f3502a93801525ee1a0fc0357f2b28ba87db888ea64bccfbfdc74fdfb667f42
 AUX twisted-19.10.0-py38.patch 3997 BLAKE2B 26df585019d5e2aca4257c9a7840a973ee9e1f3dfce65c76b021b8d6ea07ed8c6abca237c11ce75b49994ea7ed95de587a433a6a6f3577cd6f2ddf243d40defd SHA512 bc6eb1b1bbb704fe30c4ef071f8d8e95faaad3089013d11765f30f4b6bdbb108b913b043c071d00c18b53655841cb1810286331c5318d4659ad7c90d90b9fb4e
 AUX twisted-19.10.0-py39-b64.patch 7022 BLAKE2B f59573231a70318aac1f383602725949f033e017c036ab204815816ef168ad122253e903ff577c1a055c12023d06dc49ebfcdecf693d9890476785653860a628 SHA512 5904bcf5eadcd53d038870d6868fec1a81d6327c31b7b2360987a69e6f4046e92e11b52260c53a2361687161a36a5b6f53b24906d404ebe25f86e5bdc11fc6dc
@@ -14,14 +7,9 @@ AUX twisted-20.3.0-py38-cgi.patch 8601 BLAKE2B 6eb76eaa1cfe10ba473a334bfd5e5a4c7
 AUX twisted-20.3.0-py38-hmac.patch 3484 BLAKE2B b89587da906517a621ba880eb6eb71cc2f397a7bcf7bcf065f79897626f821d965b2daa0d105af7e48c8c30fb79fb836c02db17058b5ac046ae92f9578899a62 SHA512 a6ed24994bf76a7e602144eed706c61cce531408db050dc2a497fb4131b5594f4d29ebd34c0d780b283460d130dfc88b19ad9cbe5436c0290b9b13eb35c9342b
 AUX twisted-20.3.0-py39-b64.patch 6747 BLAKE2B 1bb6960e5049f43b08e2ba7a56a16616e82f3b18290645b2f14bd15a199d3e1b2767e030a8295fc2d3f4a8a3d1a6e4a5d5d7d55a089da643c593b2a3df174119 SHA512 6f58dcecf07925d15a1373726e03da4083a0266ee6629089b30b0c8ab62bd007579942430989df2d550578067e2c2c542062dd20a38851794f6ef86e85aefb95
 AUX twisted-20.3.0-py39-combined.patch 3752 BLAKE2B 687698bccf6af3213812ae29e7e234c36941f0f7ecfdcfa8c14a6a7b5a433b9ff2a40c2ad870e46b3437210202cf0dc58e17c8d29ebf506c499780355cf60bdb SHA512 81f0b597a7b2609bae5f405388bccf759dd6b0295cf05e6ef2aee76d0f3ab4367a474704aab2753d101be2580d097f30d94acc529035bdb3c3ec43dd035fb733
-AUX utf8_overrides.patch 2288 BLAKE2B 450f921f6a07cd56d9311c15c9f2bf342ec82c807325ebb5b5c2fd61572d489ac7f1c8978892530016a343b7284c580def705127c57ce947a2698835e447b8ce SHA512 b495268282e0233c570655b2b3d42ecc90116b22c36cdec4ebf581ce1019abedb7ee301d860ec161b4b5e691d1b747ad45257966b5f510de8dcce8271021e7e8
-DIST Twisted-16.6.0.tar.bz2 2979747 BLAKE2B 898e0a0fa3ae8547a801b09118423ec8ad80727dd6d034e3f8a151f084eff5a3fc560f2eb9e76c452a14ec90b36d93e14d3bbb388010c3c5c01fd1c4d5ca16bb SHA512 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf
-DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b82cd035ba3329b3faaf950339a6653de697ba3873b37b22f9d7f8a66109694b80496917bf61e79c56eeb7e351ac87 SHA512 3733a6df0196ea580187da3576f5fd08f287437528a4e19813056d019cca213c61b62d879d80a12eef38661d3505ba33aac9a4fc956b19afa6da7d37a6465c83
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5783 BLAKE2B e6433d34015f3140e93ac698aaaaae9fa822de410debaa5bce42ffc5697e9c11ed0c3180ce8212703746addda39d9b0d4c30dbbef348fb821a65cc6e24d8701d SHA512 181151b8b2667f688fa08ce7aa97e2fc242c8dd168cc5498d17f6224ce18933406ddcf40a8c813a0631f4cd58e498c370d94371043c41d4b18aa44876677b979
-EBUILD twisted-18.4.0.ebuild 6270 BLAKE2B edbeb59373d55d728b255223dd7ca09043547c80513be779719704983508dd2be866e4fee90bb023f8817f95659291c262b4d037ba6609164a61d13dd660e5e4 SHA512 ae8aede1151acaa3f94553bdcefc25970e9026f4aef8a81c6a6f8f0a0e7d9c91283ff6eaf1aeb2ed8140021279ed3a985967fd6357b8ad239289604a9cc0a2a5
-EBUILD twisted-19.10.0.ebuild 5878 BLAKE2B 23231a9145a514d363600656ebc0ca2136b8be060559131fbdd9adb5235d1bd734383aca7a37e7c0befd005fce67723e55a288117a0e2273862055067f13af5f SHA512 14604830d9de35e8ea66334af5b0c9fc42a562b03d4b20425c579c654eff18047860e9cb100243c9884599fc5294b6018b3c77f54175bcb8c549aedfb0477a95
-EBUILD twisted-20.3.0.ebuild 5587 BLAKE2B a87b12179d3a460ca7185c1ba71d51f49d59934b355e3d62628c5f3eda4192572892c3a640222a22321b0a494d723aca011564609a97e28ddd553e380c5795d6 SHA512 2cfa6cc45ec6a8e1cf182c21a279d5389df6a267fa2343c7342fb305b5bb143915cf82f61dbb234cf12bbf6ca1f92935abd5c0fc891932f3d97bb08edbdc0f13
+EBUILD twisted-19.10.0.ebuild 5789 BLAKE2B 33995700df1fa184e1612aed28c2a42b413c8b5454c13a5e28ede8aa1398394b1e78159b8cea5210f18cccc10a03943a001e46d440240d2d588bd8a5c77cf097 SHA512 1c5428786d6aab20ef667578dd66d05bc22c820105fd700e1e0b15a2620985f10ad71dae14f88ccb9ddee1f155934cba4d3d01e9b87990ce521eedf3d751b45c
+EBUILD twisted-20.3.0.ebuild 5596 BLAKE2B 9dcb2d8428d9fb97f1d84bad8fdb3e78b349a003cb1a5a2c62832ebc03c8906fa586f9e4b1e95d02c871c90cafad2721e6939f003f71f598954ba6200a948ad4 SHA512 77383ed93cf4fa6051d257e7b7506f5efe399a274d112c9be6fb2f377e799261e034d14e0f750d0023e926e816e96db485c074557de0c06b760e938d08d3fda9
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/files/test_main.patch b/dev-python/twisted/files/test_main.patch
deleted file mode 100644
index bfef40450d52..000000000000
--- a/dev-python/twisted/files/test_main.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2c3c28f5dbbd61bcfa5c548d1d423fffbaf2132d Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 09:32:18 -0700
-Subject: [PATCH] tests/test_main.py: Fix test_twisted to handle differntly
- sorted options
-
-Some systems retuned the usage with '__main__.py' instead of the command 'trial'
-So, substitute that out if it exists.
-The options returned via python can be a different sort order than is output via the
-command --help.  So break up the lines into a list and check equality, lines are neither
-missing or extra.
----
- src/twisted/test/test_main.py | 34 ++++++++++++++++++++++++++++++++--
- 1 file changed, 32 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/test/test_main.py b/src/twisted/test/test_main.py
-index 572769018..b010a389e 100644
---- a/src/twisted/test/test_main.py
-+++ b/src/twisted/test/test_main.py
-@@ -18,6 +18,10 @@ from twisted.trial.unittest import TestCase
- 
- class MainTests(TestCase):
-     """Test that twisted scripts can be invoked as modules."""
-+    # this test just does not work correctly on Gentoo
-+    # the output has '__main__.py' instead of 'trial'
-+    # I have only been able to get 2.7 working correctly
-+    # with replacing the value with what is expected.
-     def test_twisted(self):
-         """Invoking python -m twisted should execute twist."""
-         cmd = sys.executable
-@@ -28,11 +32,37 @@ class MainTests(TestCase):
- 
-         def processEnded(ign):
-             f = p.outF
--            output = f.getvalue().replace(b'\r\n', b'\n')
-+            # Some systems may return __main__.py instead of the command name expected
-+            output = f.getvalue().replace(b'\r\n', b'\n').replace(b"__main__.py", b"trial")
- 
-             options = TwistOptions()
-             message = '{}\n'.format(options).encode('utf-8')
--            self.assertEqual(output, message)
-+            # NOTE: python may return the  options in a different order
-+            # than is output via the command --help option
-+            # so we must break up the text and compare that lines
-+            # are not missing or extra from what is expected
-+            a = output.split(b'\n')
-+            b = message.split(b'\n')
-+            extras = []
-+            missing = []
-+            equal_len = (len(a) == len(b))
-+            for i in a:
-+                if i not in b:
-+                    extras.append(i)
-+            for i in b:
-+                if i not in a:
-+                    missing.append(i)
-+
-+            self.assertTrue(equal_len,
-+                msg="Usage reported a different number of lines than expected")
-+            self.assertTrue(extras == [],
-+                msg="Usage returned these extra lines not expected: %s"
-+                    % '\n'.join(extras)
-+            )
-+            self.assertTrue(missing == [],
-+                msg="Usage was missing these expected lines: %s"
-+                    % '\n'.join(missing)
-+            )
-         return d.addCallback(processEnded)
- 
-     def test_twisted_import(self):
--- 
-2.12.1
-
diff --git a/dev-python/twisted/files/trial b/dev-python/twisted/files/trial
deleted file mode 100644
index 8da58861abf6..000000000000
--- a/dev-python/twisted/files/trial
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) Twisted Matrix Laboratories.
-# See LICENSE for details.
-import os, sys
-
-try:
-    import _preamble
-except ImportError:
-    try:
-        sys.exc_clear()
-    except AttributeError:
-        # exc_clear() (and the requirement for it) has been removed from Py3
-        pass
-
-# begin chdir armor
-sys.path[:] = map(os.path.abspath, sys.path)
-# end chdir armor
-
-sys.path.insert(0, os.path.abspath(os.getcwd()))
-
-from twisted.scripts.trial import run
-run()
diff --git a/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
deleted file mode 100644
index ed1a46840678..000000000000
--- a/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/twisted/plugin.py
-+++ src/twisted/plugin.py
-@@ -180,7 +180,7 @@
-             if pluginKey not in existingKeys:
-                 del dropinDotCache[pluginKey]
-                 needsWrite = True
--        if needsWrite:
-+        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
-             try:
-                 dropinPath.setContent(pickle.dumps(dropinDotCache))
-             except:
diff --git a/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch b/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
deleted file mode 100644
index 3ce04aa3f684..000000000000
--- a/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From 91b6d8b5b9d602152fb7148c6e2921463b93a8a5 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 10:55:32 -0700
-Subject: [PATCH] twisted test overrides
-
----
- src/twisted/internet/test/test_gireactor.py |  3 ++-
- src/twisted/pair/test/test_ethernet.py      |  9 +++++++++
- src/twisted/pair/test/test_ip.py            |  8 ++++++++
- src/twisted/pair/test/test_rawudp.py        | 10 +++++++++-
- src/twisted/pair/test/test_tuntap.py        | 16 ++++++++++++++++
- src/twisted/python/test/test_dist3.py       |  2 ++
- src/twisted/test/test_ident.py              |  5 ++++-
- src/twisted/test/test_plugin.py             |  6 ++++++
- src/twisted/test/test_policies.py           |  5 +++++
- src/twisted/test/test_udp.py                |  6 ++++++
- 10 files changed, 67 insertions(+), 3 deletions(-)
-
-diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
-index 43147fdce..6333218e7 100644
---- a/src/twisted/internet/test/test_gireactor.py
-+++ b/src/twisted/internet/test/test_gireactor.py
-@@ -39,6 +39,7 @@ from twisted.python.compat import _PY3
- if gireactor is None:
-     skip = "gtk3/gi not importable"
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
- 
- 
- class GApplicationRegistrationTests(ReactorBuilder, TestCase):
-@@ -103,7 +104,7 @@ class GApplicationRegistrationTests(ReactorBuilder, TestCase):
- 
-         self.runReactor(app, reactor)
- 
--    if gtk3reactor is None:
-+    if gtk3reactor is None or EMERGE_TEST_OVERRIDE:
-         test_gtkApplicationActivate.skip = (
-             "Gtk unavailable (may require running with X11 DISPLAY env set)")
- 
-diff --git a/src/twisted/pair/test/test_ethernet.py b/src/twisted/pair/test/test_ethernet.py
-index a4c3a5d19..fe9c57151 100644
---- a/src/twisted/pair/test/test_ethernet.py
-+++ b/src/twisted/pair/test/test_ethernet.py
-@@ -1,11 +1,16 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
-+
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.python import components
- from twisted.pair import ethernet, raw
- from zope.interface import implementer
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- @implementer(raw.IRawPacketProtocol)
- class MyProtocol:
-@@ -221,3 +226,7 @@ class EthernetTests(unittest.TestCase):
-                 raise
-         else:
-             raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+
-+if EMERGE_TEST_OVERRIDE:
-+    EthernetTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_ip.py b/src/twisted/pair/test/test_ip.py
-index 0f192a357..0a99658ef 100644
---- a/src/twisted/pair/test/test_ip.py
-+++ b/src/twisted/pair/test/test_ip.py
-@@ -1,11 +1,16 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
-+
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.python import components
- from twisted.pair import ip, raw
- from zope import interface
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- @interface.implementer(raw.IRawDatagramProtocol)
- class MyProtocol:
-@@ -432,3 +437,6 @@ class IPTests(unittest.TestCase):
-                 raise
-         else:
-             raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+if EMERGE_TEST_OVERRIDE:
-+    IPTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_rawudp.py b/src/twisted/pair/test/test_rawudp.py
-index 15aae10f1..dade38618 100644
---- a/src/twisted/pair/test/test_rawudp.py
-+++ b/src/twisted/pair/test/test_rawudp.py
-@@ -1,12 +1,17 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
--
- #
-+
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.internet import protocol
- from twisted.pair import rawudp
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
-+
- class MyProtocol(protocol.DatagramProtocol):
-     def __init__(self, expecting):
-         self.expecting = list(expecting)
-@@ -325,3 +330,6 @@ class RawUDPTests(unittest.TestCase):
-                 raise
-         else:
-             raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+if EMERGE_TEST_OVERRIDE:
-+    RawUDPTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_tuntap.py b/src/twisted/pair/test/test_tuntap.py
-index 5e2da6e0f..53e03a008 100644
---- a/src/twisted/pair/test/test_tuntap.py
-+++ b/src/twisted/pair/test/test_tuntap.py
-@@ -64,6 +64,7 @@ if platformSkip is None:
- else:
-     skip = platformSkip
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
- 
- 
- @implementer(IReactorFDSet)
-@@ -1417,3 +1418,18 @@ class RealIOSystemTests(IOSystemTestsMixin, SynchronousTestCase,
-     """
-     General L{_IInputOutputSystem} tests applied to L{_RealSystem}.
-     """
-+
-+if EMERGE_TEST_OVERRIDE:
-+    RealIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    MemoryIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TapTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunnelAddressEqualityTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunnelAddressTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TuntapPortTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunnelTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    FakeTapDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    FakeTapDeviceWithPITests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    FakeTunDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    RealDeviceWithProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    RealDeviceWithoutProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/python/test/test_dist3.py b/src/twisted/python/test/test_dist3.py
-index 3ce2bdd60..494674bc7 100644
---- a/src/twisted/python/test/test_dist3.py
-+++ b/src/twisted/python/test/test_dist3.py
-@@ -53,3 +53,5 @@ class ModulesToInstallTests(TestCase):
-         test_exist.skip = "Only on Python 2"
-     else:
-         test_notexist.skip = "Only on Python 3"
-+
-+ModulesToInstallTests.skip = "This is an upstream distribution test only"
-diff --git a/src/twisted/test/test_ident.py b/src/twisted/test/test_ident.py
-index d86b840e5..3cc40261f 100644
---- a/src/twisted/test/test_ident.py
-+++ b/src/twisted/test/test_ident.py
-@@ -12,7 +12,7 @@ from twisted.protocols import ident
- from twisted.python import failure
- from twisted.internet import error
- from twisted.internet import defer
--from twisted.python.compat import NativeStringIO
-+from twisted.python.compat import NativeStringIO, _PY3
- 
- from twisted.trial import unittest
- from twisted.test.proto_helpers import StringTransport
-@@ -216,6 +216,9 @@ class ProcMixinTests(unittest.TestCase):
-         """
-         L{ident.ProcServerMixin.lookup} uses the Linux TCP process table.
-         """
-+        if not _PY3:
-+            # test is broken in py2.7
-+            return
-         open_calls = []
- 
-         def mocked_open(*args, **kwargs):
-diff --git a/src/twisted/test/test_plugin.py b/src/twisted/test/test_plugin.py
-index a23caa72b..a6d61858c 100644
---- a/src/twisted/test/test_plugin.py
-+++ b/src/twisted/test/test_plugin.py
-@@ -29,6 +29,8 @@ else:
-         On python 2, import caches don't need to be invalidated.
-         """
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- 
- class ITestPlugin(Interface):
-@@ -327,6 +329,8 @@ class PluginTests(unittest.TestCase):
-         attainable, but an error should be logged to show that the cache
-         couldn't be updated.
-         """
-+        if EMERGE_TEST_OVERRIDE:
-+            return
-         # Generate the cache
-         plugin.getCache(self.module)
- 
-@@ -580,6 +584,8 @@ class DeveloperSetupTests(unittest.TestCase):
-         provide useful coverage on Windows due to the different meaning of
-         "read-only directory".
-         """
-+        if EMERGE_TEST_OVERRIDE:
-+            return
-         self.unlockSystem()
-         self.sysplug.child('newstuff.py').setContent(pluginFileContents('one'))
-         self.lockSystem()
-diff --git a/src/twisted/test/test_policies.py b/src/twisted/test/test_policies.py
-index 3d92633d6..c08809a66 100644
---- a/src/twisted/test/test_policies.py
-+++ b/src/twisted/test/test_policies.py
-@@ -7,6 +7,8 @@ Test code for policies.
- 
- from __future__ import division, absolute_import
- 
-+import os
-+
- from zope.interface import Interface, implementer, implementedBy
- 
- from twisted.python.compat import NativeStringIO
-@@ -23,6 +25,7 @@ try:
- except ImportError:
-     import __builtin__ as builtins
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
- 
- 
- class SimpleProtocol(protocol.Protocol):
-@@ -883,6 +886,8 @@ class LoggingFactoryTests(unittest.TestCase):
-         automatically opens a unique log file for that protocol and attaches
-         the logfile to the built protocol.
-         """
-+        if EMERGE_TEST_OVERRIDE:
-+            return
-         open_calls = []
-         open_rvalues = []
- 
-diff --git a/src/twisted/test/test_udp.py b/src/twisted/test/test_udp.py
-index 6cf4583b2..86b513704 100644
---- a/src/twisted/test/test_udp.py
-+++ b/src/twisted/test/test_udp.py
-@@ -8,6 +8,8 @@ Tests for implementations of L{IReactorUDP} and L{IReactorMulticast}.
- 
- from __future__ import division, absolute_import
- 
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.python.compat import intToBytes
-@@ -15,6 +17,8 @@ from twisted.internet.defer import Deferred, gatherResults, maybeDeferred
- from twisted.internet import protocol, reactor, error, defer, interfaces, udp
- from twisted.python import runtime
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- class Mixin:
- 
-@@ -699,3 +703,5 @@ if not interfaces.IReactorUDP(reactor, None):
-     ReactorShutdownInteractionTests.skip = "This reactor does not support UDP"
- if not interfaces.IReactorMulticast(reactor, None):
-     MulticastTests.skip = "This reactor does not support multicast"
-+elif EMERGE_TEST_OVERRIDE:
-+    MulticastTests.skip = "This reactor test does not work via FEATURES=test emerge twisted"
--- 
-2.12.1
-
diff --git a/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch b/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
deleted file mode 100644
index ea7a480abace..000000000000
--- a/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From e58956fe12af7b41f6c1735ba7b14cba69e82a5e Mon Sep 17 00:00:00 2001
-From: Craig Rodrigues <rodrigc@FreeBSD.org>
-Date: Fri, 6 Oct 2017 02:47:55 -0700
-Subject: [PATCH] Fix test on Python 3.6.3
-
----
- src/twisted/test/test_sslverify.py | 53 +++++++++++++++++++++++++++++------------------------
- 1 file changed, 29 insertions(+), 24 deletions(-)
-
-diff --git a/src/twisted/test/test_sslverify.py b/src/twisted/test/test_sslverify.py
-index aca56f5..3fdc480 100644
---- a/src/twisted/test/test_sslverify.py
-+++ b/src/twisted/test/test_sslverify.py
-@@ -3052,28 +3052,33 @@ class SelectVerifyImplementationTests(unittest.SynchronousTestCase):
-             in self.flushWarnings()
-             if warning["category"] == UserWarning)
- 
--        if _PY3:
--            importError = (
--                "'import of 'service_identity' halted; None in sys.modules'")
--        else:
--            importError = "'No module named service_identity'"
--
--        expectedMessage = (
--            "You do not have a working installation of the "
--            "service_identity module: {message}.  Please install it from "
--            "<https://pypi.python.org/pypi/service_identity> "
--            "and make sure all of its dependencies are satisfied.  "
--            "Without the service_identity module, Twisted can perform only "
--            "rudimentary TLS client hostname verification.  Many valid "
--            "certificate/hostname mappings may be rejected.").format(
--                message=importError)
-+        importErrors =[
-+            # Python 3.6.3
-+            "'import of service_identity halted; None in sys.modules'",
-+            # Python 3
-+            "'import of 'service_identity' halted; None in sys.modules'",
-+            # Python 2
-+            "'No module named service_identity'"
-+        ]
- 
--        self.assertEqual(
--            (warning["message"], warning["filename"], warning["lineno"]),
--
--            # Make sure we're abusing the warning system to a sufficient
--            # degree: there is no filename or line number that makes sense for
--            # this warning to "blame" for the problem.  It is a system
--            # misconfiguration.  So the location information should be blank
--            # (or as blank as we can make it).
--            (expectedMessage, "", 0))
-+        expectedMessages = []
-+        for importError in importErrors:
-+            expectedMessages.append(
-+                "You do not have a working installation of the "
-+                "service_identity module: {message}.  Please install it from "
-+                "<https://pypi.python.org/pypi/service_identity> "
-+                "and make sure all of its dependencies are satisfied.  "
-+                "Without the service_identity module, Twisted can perform only"
-+                " rudimentary TLS client hostname verification.  Many valid "
-+                "certificate/hostname mappings may be rejected.".format(
-+                message=importError))
-+
-+        self.assertIn(warning["message"], expectedMessages)
-+
-+        # Make sure we're abusing the warning system to a sufficient
-+        # degree: there is no filename or line number that makes sense for
-+        # this warning to "blame" for the problem.  It is a system
-+        # misconfiguration.  So the location information should be blank
-+        # (or as blank as we can make it).
-+        self.assertEqual(warning["filename"], "")
-+        self.assertEqual(warning["lineno"], 0)
---
-libgit2 0.26.0
-
diff --git a/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch b/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
deleted file mode 100644
index 7e3ec26bcfdb..000000000000
--- a/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c7db4c055e92509e5c19a051cbebea53034994ba Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <bdolbec@gaikai.com>
-Date: Wed, 25 Oct 2017 14:39:57 -0700
-Subject: [PATCH] python-2.7 utf-8 fixes
-
----
- src/twisted/test/test_twistd.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
-index 3a9d337..4b0cf28 100644
---- a/src/twisted/test/test_twistd.py
-+++ b/src/twisted/test/test_twistd.py
-@@ -1902,8 +1902,12 @@ class DaemonizeTests(unittest.TestCase):
-         message is Unicode, the child encodes the message as ascii
-         with backslash Unicode code points.
-         """
-+        if sys.hexversion >= 0x3000000:
-+            reported_str = b'\u2022'
-+        else:
-+            reported_str = b'\xe2\x80\xa2'
-         self.assertErrorWritten(raised=u"\u2022",
--                                reported=b'1 RuntimeError: \\u2022')
-+                                reported=b'1 RuntimeError: ' + reported_str)
- 
- 
- 
-@@ -2003,9 +2007,15 @@ class DaemonizeTests(unittest.TestCase):
-         unicode and too long, it's truncated by the child, even if
-         this splits a unicode escape sequence.
-         """
-+        if sys.hexversion >= 0x3000000:
-+            reported_str = b'\\u2022'
-+            length = 14
-+        else:
-+            reported_str = b'\xe2\x80\xa2'
-+            length = 28
-         self.assertErrorWritten(
-             raised=u"\u2022" * 30,
--            reported=b'1 RuntimeError: ' + b'\\u2022' * 14,
-+            reported=b'1 RuntimeError: ' + reported_str * length,
-         )
- 
- 
---
-libgit2 0.26.0
-
diff --git a/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch b/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch
deleted file mode 100644
index 318304e58df3..000000000000
--- a/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cac07e9ef273b065eeebbeeaa27155c8402a36e1 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 7 Jul 2018 11:37:23 -0700
-Subject: [PATCH] Disable writing of plugin cache
-
----
- src/twisted/plugin.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/twisted/plugin.py b/src/twisted/plugin.py
-index 82522ee..e5849d6 100644
---- a/src/twisted/plugin.py
-+++ b/src/twisted/plugin.py
-@@ -180,7 +180,7 @@ def getCache(module):
-             if pluginKey not in existingKeys:
-                 del dropinDotCache[pluginKey]
-                 needsWrite = True
--        if needsWrite:
-+        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
-             try:
-                 dropinPath.setContent(pickle.dumps(dropinDotCache))
-             except OSError as e:
---
-libgit2 0.26.4
-
diff --git a/dev-python/twisted/files/utf8_overrides.patch b/dev-python/twisted/files/utf8_overrides.patch
deleted file mode 100644
index 41f48cebfd84..000000000000
--- a/dev-python/twisted/files/utf8_overrides.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f8b2e95cc9bd1cbae565e1b4d576950961edc9a7 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 09:40:16 -0700
-Subject: [PATCH] UTF8 test overrides:  The DaemonizeTests SafeStrTests tests
- may need to be run independantly
-
-Some other tests may leave python in a state that returns a different form of the b'\\u2022'
-bytestring (b'\xe2\x80\xa2') which causes the tests to fail.
-In StafeStrTests, the returned 't\\xfcst' != 't\xc3\xbcst' originally sent, but is just
-the unicode equivalent.
-
-This adds an environment override which can be used to skip these test during a full
-"trial twisted" run.  The DaemonizeTests, SafeStrTests can then be run independantly
-with a clean python interpreter.
----
- src/twisted/test/test_reflect.py | 6 ++++++
- src/twisted/test/test_twistd.py  | 3 +++
- 2 files changed, 9 insertions(+)
-
-diff --git a/src/twisted/test/test_reflect.py b/src/twisted/test/test_reflect.py
-index ff0c7fc9e..0c13b949b 100644
---- a/src/twisted/test/test_reflect.py
-+++ b/src/twisted/test/test_reflect.py
-@@ -19,6 +19,9 @@ from twisted.python.reflect import (
-     accumulateMethods, prefixedMethods, prefixedMethodNames,
-     addMethodNamesToDict, fullyQualifiedName)
- 
-+UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
-+
-+
- 
- class Base(object):
-     """
-@@ -553,6 +556,9 @@ class SafeStrTests(TestCase):
-         x = b't\xc3\xbcst'
-         self.assertEqual(reflect.safe_str(x), x)
- 
-+    if UTF8_OVERRIDES:
-+        test_workingUtf8_2.skip = "test_workingUtf8_2 requires to be run independantly of other tests"
-+
- 
-     def test_workingUtf8_3(self):
-         """
-diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
-index b74fe4a08..d55be16b9 100644
---- a/src/twisted/test/test_twistd.py
-+++ b/src/twisted/test/test_twistd.py
-@@ -78,6 +78,7 @@ if getattr(os, 'setuid', None) is None:
- else:
-     setuidSkip = None
- 
-+UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
- 
- 
- def patchUserDatabase(patch, user, uid, group, gid):
-@@ -1913,3 +1914,5 @@ class DaemonizeTests(unittest.TestCase):
- 
- if _twistd_unix is None:
-     DaemonizeTests.skip = "twistd unix support not available"
-+elif UTF8_OVERRIDES:
-+    DaemonizeTests.skip = "twistd.DaemonizeTests testing needs to be run separately"
--- 
-2.12.1
-
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
deleted file mode 100644
index 07002498ec45..000000000000
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6)
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic distutils-r1 versionator
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-	"${FILESDIR}/test_main.patch"
-	"${FILESDIR}/utf8_overrides.patch"
-	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
-)
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		# Remove since this is an upstream distribution test for making releases
-		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see https://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	export EMERGE_TEST_OVERRIDE=1
-	export UTF8_OVERRIDES=1
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}" || die
-	chmod +x "${TEST_DIR}"/trial || die
-
-	pushd "${TEST_DIR}" > /dev/null || die
-
-	if ! "${TEST_DIR}"/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-	# due to an anomoly in the tests, python doesn't return the correct form
-	# of the escape sequence. So run those test separately with a clean python interpreter
-	export UTF8_OVERRIDES=0
-	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
-		die "DaemonizeTests failed with ${EPYTHON}"
-	fi
-	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
-		die "SafeStrTests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-		einfo "There are a few known python-2.7 errors due to some unicode issues"
-		einfo "which are different in Gentoo installed python-2.7"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
deleted file mode 100644
index 131a2e05578d..000000000000
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(ver_cut 1-2)
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
-RESTRICT="!test? ( test )"
-
-# openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
-RDEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# ${PN}-17.9.0-Fix-test-on-Python-363.patch"  <== version specific from upstream
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-18.4.0-Disable-writing-of-plugin-cache.patch"
-	"${FILESDIR}/test_main.patch"
-	"${FILESDIR}/utf8_overrides.patch"
-	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
-	"${FILESDIR}/${PN}-17.9.0-python-27-utf-8-fix.patch"
-)
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		# Remove since this is an upstream distribution test for making releases
-		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
-
-		# Conch doesn't work with latest >=OpenSSH 7.6
-		#   - https://twistedmatrix.com/trac/ticket/9311
-		#   - https://twistedmatrix.com/trac/ticket/9515
-		rm src/twisted/conch/test/test_conch.py || die "rm src/twisted/conch/test/test_conch.py FAILED"
-		rm src/twisted/conch/test/test_cftp.py || die "rm src/twisted/conch/test/test_cftp.py FAILED"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see https://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	export EMERGE_TEST_OVERRIDE=1
-	export UTF8_OVERRIDES=1
-	unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}" || die
-	chmod +x "${TEST_DIR}"/trial || die
-
-	pushd "${TEST_DIR}" > /dev/null || die
-
-	if ! "${TEST_DIR}"/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-	# due to an anomoly in the tests, python doesn't return the correct form
-	# of the escape sequence. So run those test separately with a clean python interpreter
-	export UTF8_OVERRIDES=0
-	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
-		die "DaemonizeTests failed with ${EPYTHON}"
-	fi
-	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
-		die "SafeStrTests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 720e3b98f647..ed3222af413e 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -19,11 +19,11 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 S=${WORKDIR}/${TWISTED_P}
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
+IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -45,7 +45,6 @@ RDEPEND="
 		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
 	)
 	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
 	http2? (
 		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
 		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 3ee3d08b812a..a3fc5aa507b9 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
 SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 6b056ca6b6fd..fc16bb58a927 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,3 +1,3 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
-EBUILD typed-ast-1.4.1.ebuild 561 BLAKE2B 763233636997b1c4ffbe753e9fcd95ee3f12490a15dea13ba4831a2dbfb14a570c2bae59753731266f4957407a7a57ec9270782e72c338fdc12b98a73bd0189b SHA512 d2fddaf2df99de2cf1c29f568f91240d03d77300e94fe45ee787892756f343f3c67de26232de070b454c65681f587fcd0f55d531a9034008f84b3be9a470567f
+EBUILD typed-ast-1.4.1.ebuild 560 BLAKE2B 9d7796a0ac73eac0abf92cea857176ba95a0744b4c4cac7bd13f8e1e6f395cf9bde8f0faafa5cf3e53b4dc323b2feda27c0bc679161a2673a53100ee1a22d6ad SHA512 7fc00394894e31b51b87be719efb452ffea6f6b57b15381307007e698ad105ed67d494d6a3500fb06781f3daab566ce6da8050b8e5a9fccd3d4b75513a29bdf6
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.1.ebuild b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
index 769e7010ad2c..cfa76a21bd2d 100644
--- a/dev-python/typed-ast/typed-ast-1.4.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 289ba3971046..c9aaabc68d1b 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -4,8 +4,11 @@ AUX ujson-1.35-sort_keys-segfault.patch 2360 BLAKE2B 774cd15a52a333456e0f7a4996d
 AUX ujson-1.35-standard-handling-of-none.patch 2563 BLAKE2B 55a2ad075f7ed348ec4f92727e9bfab2c41a734412706102e1b0df8c04f969d4273354cdb570b3334a4bcb7ec3cdef7c1c836405345165e129ab82a0f53f8f35 SHA512 3d3b7a3dc3d055c4c3cc94acdced6d5b154bfe23ff371230924f5ac7ea982997b2d404dc643c53e606c76b41a5d8c41d506d3f5d3adcc6cd61633f7dbaf3e30e
 AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664ef60a908b99f6cd657c5ade674979f1b05e4c61dbb514eba09d3727c6c61eddc5b08fde5043cdd2af0477c996d9fe9bb43a4838380 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
+AUX ujson-3.0.0-pypy3-test.patch 2694 BLAKE2B 415ba9375614c69aa4397aa0401e6093043d2f847ee68287b2f3fc497ee0bd98fb3974cae86e8bf9b0af69d088250b90871b5597bf046cb803ceeb5a64d6f60a SHA512 d59021415229142e673059bd18d313ac3886b70f39dc9e53bf592d4b796ceedd096468adb5c5aeaadf99c2cad2d2d6188ebdbe5b32aeeb83ba9cd1890327226b
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 DIST ujson-2.0.3.tar.gz 7127432 BLAKE2B 09fc3bdd127e5b54cfb26ffe56eced194d7c4aaab5717a396e06317de26f34815d04cce2b67ccb0157474165bdbdc62f0171b9485d7083dc1c01aa7252afeb5a SHA512 2c1879c372745966a00e064559dbf615f282ef192cbdbb29243c48169fc5f6e9344eba29988a1de3b5b0d1fe7699fcd88373d6dbb2e3fb59b1e8ef12b8a0375d
+DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
 EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B 6ab2c9fc8d238905603795685517d7e7d8885311653acb0fc3dbeb329ac91f0a465315f25437d42fdca24627d8a1584becef51d61aab1af49eb85f28933124a1 SHA512 1f0e47f81964b8d7691863477836750ef7c9c44e900f94502c0498088fc5d2ff2e7770342273f1a2ea4356900741fef872c99bdc2636f247ee495ca4af269883
 EBUILD ujson-2.0.3.ebuild 583 BLAKE2B 24b7c4e57672c9700976bfe3dab1c3a99c6a5eaa81dbcdacc0ddaf46cf780b59b1ceb86097e453d35c54d9b1d605d07126a2af476c10475b95da45590a9d5cb9 SHA512 0d646f96fe82f4fd3e28ce4b0afe969a6035438f033290aad0a08905b4f800e20344df1d523a2bd86cc9fed5241d0a3b876389c8a1b09d16f8caa9ad4357a400
+EBUILD ujson-3.0.0.ebuild 635 BLAKE2B 7e8b8520525861b7518e3c5a1a53bf1f5bedfd83b2610bac87f9179f51aaea0c3f0b4196ef87a1b4933b557c386b12ce2d09defa886ec15e74fd4fb5870e412a SHA512 81cc447cf26dcda9a350c7ec09bb2cc88f6bdff8a26aee6c7442224fa16afb7cbe2008b349edace853b95595ebd6b114cd9517058ff496f4df169a2ced5e6862
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch b/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch
new file mode 100644
index 000000000000..3bee41bc938a
--- /dev/null
+++ b/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch
@@ -0,0 +1,80 @@
+From c9a5ee46a1112d5f7e51defebeefb1e0ab43111e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 12 Jun 2020 15:04:57 +0200
+Subject: [PATCH 1/3] Do not depend on specific exception messages in tests
+
+Fix test_encode_raises_allow_nan() not to depend on specific exception
+messages.  This fixes test failures on PyPy which just happens to use
+different error messages.
+---
+ tests/test_ujson.py | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/tests/test_ujson.py b/tests/test_ujson.py
+index 72018a0..1d41de5 100644
+--- a/tests/test_ujson.py
++++ b/tests/test_ujson.py
+@@ -614,18 +614,17 @@ def test_dumps_raises(test_input, expected_exception, expected_message):
+ 
+ 
+ @pytest.mark.parametrize(
+-    "test_input, expected_exception, expected_message",
++    "test_input, expected_exception",
+     [
+-        (float("nan"), OverflowError, "Invalid value when encoding double"),
+-        (float("inf"), OverflowError, "Invalid value when encoding double"),
+-        (-float("inf"), OverflowError, "Invalid value when encoding double"),
+-        (12839128391289382193812939, OverflowError, "int too big to convert"),
++        (float("nan"), OverflowError),
++        (float("inf"), OverflowError),
++        (-float("inf"), OverflowError),
++        (12839128391289382193812939, OverflowError),
+     ],
+ )
+-def test_encode_raises_allow_nan(test_input, expected_exception, expected_message):
++def test_encode_raises_allow_nan(test_input, expected_exception):
+     with pytest.raises(expected_exception) as e:
+         ujson.dumps(test_input, allow_nan=False)
+-    assert str(e.value) == expected_message
+ 
+ 
+ @pytest.mark.parametrize(
+-- 
+2.27.0
+
+From 66cc0ad8a76d1bef848e36d9bdcaf476047b5605 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 12 Jun 2020 15:08:27 +0200
+Subject: [PATCH 2/3] Skip GC tests on PyPy
+
+---
+ tests/test_ujson.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/test_ujson.py b/tests/test_ujson.py
+index 1d41de5..fe20174 100644
+--- a/tests/test_ujson.py
++++ b/tests/test_ujson.py
+@@ -215,6 +215,9 @@ def test_encode_dict_conversion():
+     assert test_input == ujson.decode(output)
+ 
+ 
++@pytest.mark.skipif(
++    hasattr(sys, "pypy_version_info"), reason="PyPy uses incompatible GC"
++)
+ def test_encode_dict_values_ref_counting():
+     import gc
+ 
+@@ -226,6 +229,9 @@ def test_encode_dict_values_ref_counting():
+     assert ref_count == sys.getrefcount(value)
+ 
+ 
++@pytest.mark.skipif(
++    hasattr(sys, "pypy_version_info"), reason="PyPy uses incompatible GC"
++)
+ def test_encode_dict_key_ref_counting():
+     import gc
+ 
+-- 
+2.27.0
+
diff --git a/dev-python/ujson/ujson-3.0.0.ebuild b/dev-python/ujson/ujson-3.0.0.ebuild
new file mode 100644
index 000000000000..60a87e3a0884
--- /dev/null
+++ b/dev-python/ujson/ujson-3.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pypy3-test.patch
+)
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index eb275558b781..df9bec1cd59c 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,3 +1,5 @@
 DIST uncertainties-3.0.1.tar.gz 225752 BLAKE2B 6dc872d5617b8c4e9deda5a5a60492ae1eb0facd7f053f0799b3762831f9bad7da39726811feffa3630091e00dbedf89c296ed4e1b2b1f78399ed45663ea5339 SHA512 d4b2a905665c46224586f5f9702ad9e69580fc5afe8c6c045b04141fdc54e0c402cdee033ee0ee7055823b922bd33c732b3066453876509d45add15abf9d85f5
+DIST uncertainties-3.1.4.tar.gz 148897 BLAKE2B 3e94b61ff6aac42a7910cafebee5b440541a020c58bc2ce402d0a056b5d278205f4a6556bf49073f5ded305cfa73ba7e9095e71d3963fd9b73e2e9e19ec360b5 SHA512 209ebbed1f9cf99e3263f6470b04fc737c6d34d878f7eb1d2a7df7e63d4d42b0460391a08f99d8fe09df8f7f0e1de8a8e6c2cbecaedc7f0373ab06d05fbeb955
 EBUILD uncertainties-3.0.1.ebuild 981 BLAKE2B 310adc24cb8f21eb5d8c913894c965aa6ee264e5b5ee4d299f424c015e7f8f2c72fdc7a47e0adc6d4cd8345a9651660e873b1a7aea1a1258ac3eed6bf85a7b2f SHA512 b6999cbdb6e9403fb2c4737a1dd5e3dbb0e2bff9bd26f0b29ba8679c3986f1ba919eea9d643f1866dc38c7523048cac9621a17d9a83d717a68a03d1a48d21619
+EBUILD uncertainties-3.1.4.ebuild 888 BLAKE2B d596855768d480ec5cfde978c737ed5d945603fdf011ad766c246f6acff8118f133c0775c808d479bfdc456871d1eab87a13a17048e05d87fbac49580d901a07 SHA512 023e083079fd873c91282baeba2abbb65a4ebf23cde330285d9e730630a68a1b34425838217fb161e77afd46febce0c8276ae6ed91480e50ae7f3ef8718a4c63
 MISC metadata.xml 859 BLAKE2B 54ae46c343fada9aabb973c5297eccb0abe7299a2a1f0009df1d083698c91ce25339cf63d77857febee0798b27a84ba83dde95e19255f45f8cb0141c6a009954 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89
diff --git a/dev-python/uncertainties/uncertainties-3.1.4.ebuild b/dev-python/uncertainties/uncertainties-3.1.4.ebuild
new file mode 100644
index 000000000000..f1decac029b5
--- /dev/null
+++ b/dev-python/uncertainties/uncertainties-3.1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for calculations with uncertainties"
+HOMEPAGE="https://pythonhosted.org/uncertainties/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests nose
+
+ppython_compile_all() {
+	if use doc; then
+		PYTHONPATH="${BUILD_DIR}"/lib esetup.py build_sphinx
+	fi
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index 79b7dc98cb60..c118f9468b88 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r1.ebuild 643 BLAKE2B 786761999f2462794b49d1557698d520b2d6e4000684c4fdcb41e3db100ce5109c5428f34c14e2578c9ad4b3ce1048e37cac3b91da919c03c88835b64f331761 SHA512 8bd5bb4cd8a82e479ef5c0efa1ac874241bec00822f3417aa8432315a68aeb21a99703a77ebc268a5806823fb2e0d530fe53656e8911536aefd84604f00a8d40
+EBUILD unicodecsv-0.14.1-r1.ebuild 649 BLAKE2B a328cd996028dcf8a5fbc3706e5c31645994f45a8c5ad4280e52c4f14a6908c99adecc817e80b27b86bc51b1b2951e67d2cca5143d3c372305a944cc068dec38 SHA512 bc2df62fbf420cd5a9ddbee9a942667c3a427872fe721fe9b8c241bb8226fc4a0ce2d624aea1c362a8c564d0d074d31920e0e0f5c2f09476ad711f87c1c99f4a
 MISC metadata.xml 401 BLAKE2B 3780bd09f7854a00d0273bad436367a685bb6c6711b78397f1ecbb58482975ba003faef1adc427eb406507b9a404e4ae0db27b97d5a34dbca52e1434e7caaef3 SHA512 4c1c5dc2ce0d1a546980202d0cefdb3f4a8c70780eed3fff94862ca361df47f2d6258d1ac206e83db8c7750bcd9632705c144f98b9f8358832f7427df772f834
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index ab240b9af2de..1b726c42c610 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 13a879336f42..8e2091d84708 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,5 +1,5 @@
 DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30f0b44881597735478108d8121f57e2539a8209b9aef9c90f5aa8cc9f9dc76bea837d9b2ebad502a840c37628ed5ff SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2
 DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
 EBUILD unidecode-0.04.21.ebuild 579 BLAKE2B 90e5530f98d6d38e0ded1d875e169b595cc6cef4fb34b2c5a03d7e94678514065ea7d4a8b5522b3a864f991c14c30c763b7d4762b1091283829a8d787f96845c SHA512 24a952df312877e5785302d1e17b8e2bd6d1bfa2e9cd48e760ad4b5cf344ff043056a70e6b3f415880529b788b4a1ba35fb50e9287789a1ea14a2d1dd5c97fd7
-EBUILD unidecode-1.1.1.ebuild 602 BLAKE2B 710d1e216dafaae10df8d1aec7f372f345c6ad51cb7247e2420b3fcf637b4989987b63443fc18beaea9efcd61c42c441355b410a00d4ff37e7d5e5be73cc6ad1 SHA512 3f7ec96556ac38e8f0235a659d55d2358162933d8cfc73342dc1a06fa8f6b6c3ac2da40ab9a8170801156c6f0445f8a1095ff5512b91d8ef255ab41d81ed7d47
+EBUILD unidecode-1.1.1.ebuild 581 BLAKE2B 034ad186c81dc6763c3262846a39dfe7e660a89578983133f3b16021af74aa90d7eb79ab4c40555f3a1437fab203074a1682b10a96fc43a689a873ec32e7f198 SHA512 1b121dbda93fcd818afdfc629a6b154573bc5ca65787f623093adf28bd393cb45a46ca828b8c39be7b080851523523f4d3cc043e01848bcc5351f9b0f52e6d13
 MISC metadata.xml 446 BLAKE2B 7a9fc2448eec29f2f2f3a7d068677800e749a88690a1291e74de3202f9ebb1ddba62486bddd77faa989028826cc5e055a7b10f32fc08cc4e50fd4f68b3fa3c80 SHA512 51b70c9aa1cf8fe9a094c80bb6c0895882661804af4e9becb0c37bd85852df37303988d5c3313e17839f99ae1cbec7d866d72c5c39d31a941f2b9aa5a8e1dd0c
diff --git a/dev-python/unidecode/unidecode-1.1.1.ebuild b/dev-python/unidecode/unidecode-1.1.1.ebuild
index d64032f5db3b..beafe7f03beb 100644
--- a/dev-python/unidecode/unidecode-1.1.1.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.1.ebuild
@@ -3,23 +3,20 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE="wide-unicode(+)"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
-
 inherit distutils-r1
 
+MY_P=Unidecode-${PV}
 DESCRIPTION="Module providing ASCII transliterations of Unicode text"
 HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 
-S="${WORKDIR}/${MY_P}"
-
 distutils_enable_tests setup.py
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 7f26fd0440b6..19b8311cb79c 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.6.ebuild 646 BLAKE2B 4663acb1a31332f7e155c350d3c6e798a86340ee91741048d59390d519310f5313b4ef6bf813129c8c5e5b98c7aeb9413ece66dadd4d163eacfd315932f26119 SHA512 72396455b1e299164ba5a092a64905e897b768bae1b10a14495acc4bdf6fa38dc67918bb84223a7792509338e670fa744d4a0523f5a8673b59cd724c13accad2
+EBUILD unittest-mixins-1.6.ebuild 643 BLAKE2B f8be96e34e6d50cd91823bd5db5e59ea5f6d012b7ce31eeeabafe4f79c3ba3990d261dbf4ed271eeada5b32ed6ebe57ceff8a3ee4b0c59366884f74d1b1e4dc3 SHA512 edf7528a0c244865db51f82b6e8b53cfc0affc2ab01e85cd2cb2818774e68c99e014ea35fcc3b34e3086dbce31ac5fe1af8633df93f7c55794fece2c5bbac2e5
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index 5bd9912c7a00..0ed9e7b35211 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index e521de4ec661..5a74184de17e 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
 AUX remove-argparse-dependence.patch 424 BLAKE2B 6b59d1913f24b336f9cd8bd40a0d42f281fe452937be9b1f2b7187aaff611c07de8bfe138ce9bbd42c5c812d217400d4a49ee991e44821020b5d3a131b5dea18 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7
 AUX unittest2-1.1.0-python3.5-test.patch 1304 BLAKE2B 390a1972a4f24ca348f6d1d35badd2fe9a88fada8961c16e759f39da6843a1c931040ea3cd236f20b9671efa505c58857a2872553029c88a98b75c8358ac7281 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398
 DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
-EBUILD unittest2-1.1.0.ebuild 993 BLAKE2B abc342191b3646ebf80fd1300da12acf7a9e9311af5ded5fcc7f7cceb3fc51769106d550e96cf2e2f4edf9f009203ba5731b276fdca6bec42b327333609e88e2 SHA512 5b57a800f8b9c9cbe19bdb62337992b1d7b9de2d913656241bd59f89f881547de0cdb058e96f3430fcd5c4318a64bf22f7e0332e848d75635a4d189c31aa1668
+EBUILD unittest2-1.1.0.ebuild 945 BLAKE2B 4b81a791031e83f0db1457fc09ff62b6a2ed08e6030079e72de6160d97c1edc035dd78bf6ae7aa209eaa39ab06ccf511e4d986e25ceab7e37c7fe2cba7813484 SHA512 6c8661e51be4ea6ce66d08ede9b6dcf123edd8734af638ec8296efb12f2db6648075c0c1b83fd344a7dda6afaaf0da49c6ccd8c25ad7704303cf79c7eacfb42b
 MISC metadata.xml 378 BLAKE2B e0a0ad885607d8593e090798b8facbacd746a69c3325f6d429743482a6265bff57b2d0fd6d12122e15336e063c4c1e539da10cc41ea5ab159b2c5673e8316c8e SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 7ef8bf2464c5..479a1085f05a 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -16,14 +16,13 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 	dev-python/traceback2[${PYTHON_USEDEP}]
 "
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
+
+distutils_enable_tests unittest
 
 PATCHES=(
 	"${FILESDIR}"/remove-argparse-dependence.patch
@@ -31,5 +30,6 @@ PATCHES=(
 )
 
 python_test() {
-	"${PYTHON}" -m unittest2 discover --verbose || die "tests failed under ${EPYTHON}"
+	"${PYTHON}" -m unittest2 discover --verbose ||
+		die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index afda40c16c4b..b41363f331fe 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1,3 @@
 DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
-EBUILD urwid-2.1.0.ebuild 820 BLAKE2B 48073eac0b63673f33c55eeb2551badfc98889873bd8b12811c9ae76242900e4a4e89a2f0b55aedc786eb17dda846b8e46ea47ed6c1b685ffd2ab56367a6f93c SHA512 c56af9057dc7256305f81efd4e0fcd7c977a9d51d390394dbd6fd72e6e4d1e1f8a43cbbb3259ea2497aee1859e8df9f17ac963c203cbc553df4b69e84b80fa09
+EBUILD urwid-2.1.0.ebuild 995 BLAKE2B 7bff9a6384aa4b023435fe2b4f990e7cd5550fad6ee70b904f59352aaca405db45217c4c76def3c0f2d806bade01761e9bda77f1662abdaacb3fe0232e46c50b SHA512 164cb4a14f51d2a2de09f88071a95e6ee5203e04559ac882b16c72f3555b3e9be1d77bab9c2aed6c2956728cafd35887b922ed10e9e123e97c49061254dd8aea
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/urwid-2.1.0.ebuild b/dev-python/urwid/urwid-2.1.0.ebuild
index 0239bc441784..abcbe910f5ec 100644
--- a/dev-python/urwid/urwid-2.1.0.ebuild
+++ b/dev-python/urwid/urwid-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -15,11 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
+IUSE="examples"
 
 distutils_enable_sphinx docs
 distutils_enable_tests setup.py
 
+src_prepare() {
+	# optional tests broken by modern tornado versions
+	sed -e 's:import tornado:&_broken:' \
+		-i urwid/tests/test_event_loops.py || die
+	distutils-r1_src_prepare
+}
+
 python_compile() {
 	if ! python_is_python3; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
diff --git a/dev-python/utmp/Manifest b/dev-python/utmp/Manifest
deleted file mode 100644
index 2b34a7f137f4..000000000000
--- a/dev-python/utmp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST utmp-0.4.tar.gz 4300 BLAKE2B 944b4e58158a26609b225534c26547bc751ab67752177fa8a6bb8d52ee123180b51b30fab5fed09e6e21d5e8f9d9b274122e3a03b1f936b6d521333dfb7f6fd9 SHA512 802345227a9de972a7ae1127a006aab6bb51e1a7e81772a58b9c19bee74c79c4f5219519743133e8c02b90f8a72f52e22ab668c8a78a898c00e0a9a147a68472
-EBUILD utmp-0.4.ebuild 619 BLAKE2B a518af5ad75190c068421d0b894288f6255d347c9f4b278d1a1190ac3cb42ea66e3938112dc3e2e2b302d926a1d6933e3580c92d4a75c19cb429dec565740b58 SHA512 76e78a32680d20c69a63a59b46e446f1195b16ad9eee26726a5ed8c65f22a97cfeaa07b900cfc94110a6fa8c6fb06b0ec54562893fa50f63e697f1138046875f
-MISC metadata.xml 307 BLAKE2B d6ae31f2be4537c6b2f53f7e84dc8f9551ca3b335481e62b0013d5764bc1dcc836e8bb7d098447794deed38eba8d95f1d7e5f4cf3de7661641e99abccd32fe60 SHA512 4b93db04a6c3737756bdbe1de7257a35e642c5913b4805c60385def5105c7cf57645dde785712e6a316172330969c35cc5f9208ca787b14e9fcdb4a669745ea5
diff --git a/dev-python/utmp/utmp-0.4.ebuild b/dev-python/utmp/utmp-0.4.ebuild
deleted file mode 100644
index 040e8f075e9c..000000000000
--- a/dev-python/utmp/utmp-0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="utmp/wtmp reader"
-HOMEPAGE="https://pypi.org/project/utmp/ https://srcco.de/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	!sys-apps/utempter"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed "s:'flake8'::g" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index e766c213bf7d..f2b2f8af4597 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,4 +1,3 @@
-AUX vcrpy-skip-network-tests.patch 772 BLAKE2B d98c50fde4e3df3d4e62285e9136061b877e632153c6a6ed35fc84734c3f2d744ee030930253655954bd25d334f87c1e9518fa1fd86a56b7c7b606b7ef7aa11c SHA512 90cd2cc3a89a7019b88687a54016deea9dd60cd1d80f0511f58d25efa7ad24ecaedf8e1187e3455bd7cdd88a4506787867fb04027e638ab66672cfd809ba6787
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
-EBUILD vcrpy-4.0.2.ebuild 1372 BLAKE2B 5d509e85ff4deae234b6bb57703f8321be0a72cff1dde9319d4e4c6821b75c799ba21d2d8c04d8b4d6c54bf5f7b0e2d4635fbeda7cc0ba411c5180aae2452026 SHA512 ca6f36b043eb08c122ffd45219b2a157a65b4a6817abdce58edd145d900fd686559eaa78d33e241f47b4b222798082bded3ea87a7a779394702857923a3fe537
+EBUILD vcrpy-4.0.2.ebuild 1391 BLAKE2B 8fcf248c6fa4327cdd77626cffebbfb384d202ab8ffd1d54346261d3554e4f7656972b25f8ea9fd3ab8f262193f368568ebf2977018788202aa552a5db2066c8 SHA512 0d10b4142f02427511ec76c3441a4027094bd375d96aaf1024e1865b6d34e47484d7ac05af09c427120ab8c78494ac7202def995257fa4a3e81c34833f563eae
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch b/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
deleted file mode 100644
index a1f00aa77855..000000000000
--- a/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/unit/test_stubs.py b/tests/unit/test_stubs.py
-index 7eb0684..a4bc7a1 100644
---- a/tests/unit/test_stubs.py
-+++ b/tests/unit/test_stubs.py
-@@ -1,7 +1,7 @@
- from vcr.stubs import VCRHTTPSConnection
- from vcr.compat import mock
- from vcr.cassette import Cassette
--
-+import pytest
- 
- class TestVCRConnection(object):
- 
-@@ -11,6 +11,7 @@ class TestVCRConnection(object):
-         assert vcr_connection.real_connection.ssl_version == 'example_ssl_version'
- 
-     @mock.patch('vcr.cassette.Cassette.can_play_response_for', return_value=False)
-+    @pytest.mark.skip('requires network access')
-     def testing_connect(*args):
-         vcr_connection = VCRHTTPSConnection('www.google.com')
-         vcr_connection.cassette = Cassette('test', record_mode='all')
diff --git a/dev-python/vcrpy/vcrpy-4.0.2.ebuild b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
index 576fd13f10cb..b538d90a9181 100644
--- a/dev-python/vcrpy/vcrpy-4.0.2.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index a76bede39029..1bb7caede51e 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,4 +1,4 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
-EBUILD verboselogs-1.7.ebuild 702 BLAKE2B 88f5ea916f8a5dc24723de2efc24e70903b710eb8cb9a71878e77b65d8742a99468b5a85b32037db331524da6a9e4d8ecff3b573d00d5d7184da1fac3a231d77 SHA512 77a77f6aff4e0f5cbee25cd7dc3d9f8e798376bacf26deecb16a005a86aeb64539052dca2561ce73e0246cb7ca5ed09d665f79a5d52bdf6abf3d826c6a0945aa
+EBUILD verboselogs-1.7.ebuild 707 BLAKE2B 2f68569dceaac5925615fe09f142805c13cf6010828c74af1f7ceaefc3e428dc2506086a92967615d0d6a01cbd7cfbbf7524e2224a739f9dbd83f6c6abffd714 SHA512 3a6243b2d30da741e321e62334fb39c2a752c6a7ea0a41ad966b1255dc6373170ef7f9da31ff37c7930bab35baaf5913112d18e5d3f922dc259ec075b5e60ec8
 MISC metadata.xml 324 BLAKE2B 6c8d909bd018e46f81fef3a30b87b7dcec5d48a31e919c6c60b000982d31486cb6fd8639afe42351579099454757922d7b05be5e196a3902b6ee199ff5817955 SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039
diff --git a/dev-python/verboselogs/verboselogs-1.7.ebuild b/dev-python/verboselogs/verboselogs-1.7.ebuild
index f10678084f34..15d0cfd921bd 100644
--- a/dev-python/verboselogs/verboselogs-1.7.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index cb9aad3ce0f4..7146c6b7c36d 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,5 +1,5 @@
 AUX versioneer-0.18-fix_test_git.patch 788 BLAKE2B e910a651eec861ee5fffd9f7f05860b468154fe741f1b04504221149f48ca8bc241ba383fabafce6199387839daf7373aa9912456ce9ac688db295ebe7d437d7 SHA512 44ff35bad67b41c7be786a9d8f3b6958fffb71d598eb17ce172defbf1dbda9ac40ecbfeb790900a4a8052905fc510ee5b640039fa0fcaf408ef73c3e01eea57b
 DIST versioneer-0.18.tar.gz 40552 BLAKE2B 640c010958a0178ec5ec5f06c986d83e3bc2f49df95583c4c90d3058449dcca5c7b5421ee5f2f56905b1d949bfe3bfbd87fb23ebc868ede591d078d811ccc2b3 SHA512 8d4522932b1f6aa1c13211008a57a572d54ea677cbdecd7d563ef8f77c76ed5d59f58f2e3be38a01e8cd102c264baf5c8949e9c17ea98d686ac497f8ad8b0011
-EBUILD versioneer-0.18-r1.ebuild 886 BLAKE2B e2cf102685b296fbc49b68f57a70c57981e9f6692ce7d90010846ac0c2257b8451e0e67ff27ebe703d6eb336162c688fc87be2162ce18de51e2afd10d52ab9b3 SHA512 380e93ce573e6f4ad012d9c5e59435fee126d2db59c65c145ae0a9343dafb8999143dbe422f21aef87a89e5feb24f8e8bc8a4faf12dbc3705b05ac609c5ef470
+EBUILD versioneer-0.18-r1.ebuild 932 BLAKE2B 64b1f8ff43a37265442a77d82d342c172c926cb1e45db95902dcb5ba4fb8de9df067f156c41c7e64471ec2f59e5e39d4d794633e276432003bdedec32752d4fa SHA512 50a4aa5ebca587bad112a7983f1e24c5b0976df5bc47be9388edd764c4952fb077838495dc9ffd63bcd0f74815a3997656bde72d374a1f53a0aaf5b295314d3f
 EBUILD versioneer-0.18.ebuild 797 BLAKE2B 29682ad7ff23ff788e256a60de4defb63e31e58efd010a899a34a4ddb85a882c0ad7dde1b42e5ef2f6f246063be2749d71d838bd4fd18abeee35a6d4543896c6 SHA512 f7658d3d3f256292040928597d9241d75dc1d13eddbd33a272bb5de537ffb0f4a1a5b4fb1614f6dc6bb60ab491ef0b3e856cfa22b3aeaa213ed9fa7c1847a55c
 MISC metadata.xml 414 BLAKE2B 409cab20af609a75c5795436650c1c5f83715a9f966a243089fc54fee8b726705e90a220193cfa0a61ee947599377853edd245384423bef20a925e60ea99f65d SHA512 000b7ccae83bf3951a36e8c5743759c7f02d812ed808bacb4365bbb317c16475c1b443b22b174b3411243603bbf53844cfec67aebc61350e82261cc98a99f7d0
diff --git a/dev-python/versioneer/versioneer-0.18-r1.ebuild b/dev-python/versioneer/versioneer-0.18-r1.ebuild
index 7836f1d23a3f..38d6b48aa164 100644
--- a/dev-python/versioneer/versioneer-0.18-r1.ebuild
+++ b/dev-python/versioneer/versioneer-0.18-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -31,8 +32,8 @@ PATCHES=(
 python_test() {
 	esetup.py make_versioneer
 
-	git config --global user.email "you@example.com"
-	git config --global user.name "Your Name"
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
 
 	${PYTHON} test/git/test_git.py -v || die
 }
diff --git a/dev-python/versiontools/Manifest b/dev-python/versiontools/Manifest
deleted file mode 100644
index cc56d0d23939..000000000000
--- a/dev-python/versiontools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST versiontools-1.9.1.tar.gz 19089 BLAKE2B 796f1387871067298acc60d274ba5a9c976978b4ff229d89123ded918c0873063343b5e5c32c00959d94c7a976bc878c4de5a7594ed629f16ea2ca3c638e3e6f SHA512 f062eecc9998bf194dcac7c52065757ef546aa94bbe7d5b6786ba10f1e44486df997e9a314ff60a0d4e88a2620824217c8add516011baa2ee4e26ec19f762892
-EBUILD versiontools-1.9.1-r1.ebuild 669 BLAKE2B 11b8bb546a3029d8e228cf544a1a230e89e3da4010c6047b587692da06026eb88a5b2d19740d67d2d910eb11d2b88de9882700c05bf928e481ad9918f61cd62c SHA512 f536d77f10c1791692812ad62c66b36453969e2b81de1c9b4014e5b93b69501f3bcef14bb656280df1a6dac9143f4f00b2007980751ef222679e5a101944f100
-MISC metadata.xml 370 BLAKE2B 3a2a2aab0c8e30234df740b1320606548df9e9f6e10f3b53b8822e28e7d0ece2aee643265c42a25273cab99eb38f0c5d5f3add94c5660bb8195e8ccbefe43e0c SHA512 2960d71bf6f0a11dd92600c4e62103ead304ab6d3215034fa72253bd57d7a64cea5a97c324df1d5672260b2f679b02e45efe01404cc65a45f55d751a721e48c1
diff --git a/dev-python/versiontools/metadata.xml b/dev-python/versiontools/metadata.xml
deleted file mode 100644
index 6da64af30fb7..000000000000
--- a/dev-python/versiontools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="pypi">versiontools</remote-id>
-		<remote-id type="launchpad">versiontools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
deleted file mode 100644
index 2f6bdffb0545..000000000000
--- a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Smart replacement for plain tuple used in __version__"
-HOMEPAGE="https://pypi.org/project/versiontools/ https://launchpad.net/versiontools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Expexted failure
-	sed -e s':test_cant_import:_&:' -i versiontools/tests.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index bea80c5b43d5..9ecfee816058 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -9,8 +9,8 @@ DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b482748
 DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
 DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
 EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
-EBUILD virtualenv-16.7.10.ebuild 1734 BLAKE2B e1f0b8f354cb86573f6adbaf73f99fc4ab38ec9341bf17965c6e5166ff5c71bd26ba29af095509250286ec057ead88b27e16c39d63886100a1be579322e5dade SHA512 395406a79d9be8ae64ec4bece7aae666968a89742fd74ad38ae2f58fb99e68d0eadc0e77dabd9658d0a2605f489f09de27e48268c37b8cb32c770a839156e46a
+EBUILD virtualenv-16.7.10.ebuild 1764 BLAKE2B d3006a8462b7ecfd27c0ba82f239e95e39973103cfbdce218fe078ea53947352e1590b66a3e8704f764f173a55afbc44b71a207f86e906d241d3c12cd0e97fba SHA512 4bbe5a62aa6bc3613800ff01ec293043d8fe733043ca5fe55bfd02105855b5a53802ce8b0db0d289e002a3319dc323049ca282de70619cb82e1445ae6f807f16
 EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
 EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
-EBUILD virtualenv-20.0.21.ebuild 2559 BLAKE2B 088917832382df5084b000d1f368842eeb7635782425a8ee35db98a79a513fb0cb9723e8a745c54a97be523f16f4bf63dfd8eda2310d4d820c81d4c56e2d5b7c SHA512 5e442d0333b5f2040d8de3c400e8fc9268b12733f5bc5967944df019ec044ee2488bb3d2b7c12ac3ad18f86413e994753cb9d7c6e3aa6d0cb7a715db298da0bc
+EBUILD virtualenv-20.0.21.ebuild 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index 72bbf587452c..b26dbd53d0df 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-20.0.21.ebuild b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
index 15edadfdb160..2f37b45989c3 100644
--- a/dev-python/virtualenv/virtualenv-20.0.21.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index a384e1682762..a228da2e1c5c 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,3 +1,3 @@
 DIST voluptuous-0.11.5.tar.gz 44216 BLAKE2B 921e0f35bd5348f412f0bf20939b3364b0014d3b1d1a7248cd73f2514eef0fb4e5b4b742876dc4606b5619529f1aa96e3577508ed0bf8d1e98b4d8bb88e2b8a2 SHA512 8893434e8e73ebf3682da1970d1d720444de452937ac9123fab53413c88a21d04ad3eb490902d829aa60be6804ff68b8bcf57a1c45807751c3d50be63e9b2551
-EBUILD voluptuous-0.11.5.ebuild 598 BLAKE2B fbc23b9efa73275b9a93c6a27774b416a1281570bf8712b58ac40feba75c8afaac3335d9bdb75eef500ea0d54843cfb3068606e910e214b2c3e2fcdec0dd9b3f SHA512 b67675353c810a9350c5a1721f49272eea1bb5c7d879ea992d29f9294dc9078e645485a6293c88e2bff55d6a464f230cacaaec1465199238abf9dbbe47de73da
-MISC metadata.xml 590 BLAKE2B 6d6c101d04be60962c428dc495959500a2a80aab39b7353cbd2694d27794645766c1b92b1ff09f9d8c72c5cedb4f07472a94945e8a48263d44b0134a6a0eed2c SHA512 ff4732c5a379f2607a97a45c56def4955bc542446c5545ff807138eed3992d71ffd4b3638f122accf1a272537c071ab0304717a43706efef191dfc7b35422bab
+EBUILD voluptuous-0.11.5.ebuild 526 BLAKE2B 0524f99dd3c90f446064b27a2a0d8abd6aa73bd3b2713a827cce059701e06797283dd701879b11cdfc3658cfc036465533666551e5a8bb9dd6f067623da4926e SHA512 1a059795c8e77e1d7f19fcc9cabd0bb84d265fcaa00d81b39b29387e88cf8e80139220b929a13541ec5182ba8a48bcfe0b1fbbe83340e2ab355ac41f5d0cf92d
+MISC metadata.xml 691 BLAKE2B 833a0f6176b6e2b3db23053e8be9054b28434061afa2e09aae9ceec1a3c1b841b3f0e0b9939341b66614cb12d8a002111aa554ee4c094123439de935e7e60b73 SHA512 0162ad8edf206d260e648a6a2441fdf054bc591b9368e3c78525bde5ab7e6a23f65c3f0ed1c04827847759182a8b81c0fa55ebc833a753f90a9e7df14aa04f06
diff --git a/dev-python/voluptuous/metadata.xml b/dev-python/voluptuous/metadata.xml
index b46a8cbabba5..89d22de27941 100644
--- a/dev-python/voluptuous/metadata.xml
+++ b/dev-python/voluptuous/metadata.xml
@@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Voluptuous, despite the name, is a Python data validation library. It is primarily intended for validating data coming into Python as JSON, YAML, etc.
 	</longdescription>
diff --git a/dev-python/voluptuous/voluptuous-0.11.5.ebuild b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
index 7cdce4236c2a..40ef58995c16 100644
--- a/dev-python/voluptuous/voluptuous-0.11.5.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6..9}} )
 
 inherit distutils-r1
 
@@ -13,10 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
 
 python_test() {
 	unset PYTHONPATH
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 139b7d22a966..027a3bcb1a7f 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,7 @@
 DIST waitress-1.3.1.tar.gz 167097 BLAKE2B fc1d0327720daf26c1c00eec6bc617613582325adf16eab9ba49c53029241c5975981cdf54340cc5b051cf8159f0c6e46029ad5c0477adf46b757c4487719130 SHA512 ccb871fc46bd560bff2ece706c826a3407750112cfb014378a06ee077f969814a5695d053665a4d975070944a9449efffd61daab11d03be3b06f1907a2ba0f5f
 DIST waitress-1.4.3.tar.gz 173767 BLAKE2B 4d64279c69403347c7048024b0c70f8192af5fd5ad32f873d66ddae53b011d1445fa2d8f6db0f98ab86bb92855c8882bca4903dbb3657bbe86e7cdbf6a9b67e6 SHA512 b4fd6d174fe63d83686708ffb83f61421e94cc6c6e9ebc7deeae93ea50a0c11ee523d4448e602ba03ade942912accb33d482c13a367d7dcba61ba6b4871bc3b4
+DIST waitress-1.4.4.tar.gz 173124 BLAKE2B 5521b6c983cb23bc768986e9e8d19e9fd94b1dc632661b0f136cb60176b8c9a81306b8c9604b2a5b4a1a821346cedfcea281f49ecd81686a944f60b387e1cdf9 SHA512 87d57f8cd241e3c88c30a34351d57255dc1388b5ce1bb216e1b94760db09c1f184d20ea5797b20a91bc2cf0815b5067569099f4639291b4a79e885c0ab8a9fd9
 EBUILD waitress-1.3.1.ebuild 579 BLAKE2B d3b5bc9b454dae714b1dc0e602016a051c3b7f82ade431153fef929edabeb6abdcbac0ca87ca59452ad27d9d4c79099c3286d1d35db0a87e764b8c53f4cc4f14 SHA512 136f1fcd0acca762d447f5b33113f6adc33ac5ee64ab2fcaf13a8aabe0ada16ff5120414732f0fcfbbe31bcee6b95c6c69f58ac1dfad3a2cdc4c9f4aa0d9bbe2
 EBUILD waitress-1.4.3.ebuild 588 BLAKE2B e41b2263d51e7bf5cfc2c70a14a459926a827256faf62bbc364ed7ab6ce24393678ec8be8e05e0537e0ecb75f6db5e52c3bae329979b24e8b16f6c8319816ead SHA512 753ed289cd87d9cfac2f8fd2a3e60155b97c5428627c5bb9f15fa773bbcc984f7bd107941062fb22a6877226b2f775d8da41e253bee97a8460a5e2ddf9bd6863
+EBUILD waitress-1.4.4.ebuild 675 BLAKE2B bd805b7c524f6adfd12f42a0e0aa23a2dc81525aae8eb4db634651f45e967d25cc262234ed4c260b053e95b751fd7e654596e87c95bef0b815c4a7afac48a8c5 SHA512 3a1d942eef953301cd6f089ebc5642562f271c76bae6599bbd313f61593ce024a35faaac03d1e2d236ae9226c748f8bb32d216ec88203e949d8f06abd618aea7
 MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/waitress-1.4.4.ebuild b/dev-python/waitress/waitress-1.4.4.ebuild
new file mode 100644
index 000000000000..6ec338584415
--- /dev/null
+++ b/dev-python/waitress/waitress-1.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python WSGI server"
+HOMEPAGE="https://docs.pylonsproject.org/projects/waitress/en/latest/
+	https://pypi.org/project/waitress/
+	https://github.com/Pylons/waitress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 9c9cf47bc8c1..65ddf56e76b5 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,5 +1,5 @@
 DIST warlock-1.3.0.tar.gz 8853 BLAKE2B 51b313f81cc7009b2b336d6ea7ecf5b78adfe33b3efee3abd9b2296f90716db25fcd4a06eb6946c26c3700ccf5d090da716bd4c5a7864f285e26bd2504700c3c SHA512 0c60c624e89782009a79a0174e6855a9d3a084403f5fa8fc676ad28c42184ff44c43684d6ab68262045f75588932ab4679dffb05f7762c290741ca645d90f32a
 DIST warlock-1.3.3.tar.gz 11602 BLAKE2B 8d3bd3cd19f27e9c4ceac97f242742c58c6687659d8ab0ea42da74ce948e43415e513e7d7269767b76b21c995229702da66c64688119bbfcc0d30e872af1b65e SHA512 b6f96aa8e084872397744641e3fdc0e7c8d0a9285b048e894b66ccb42af65301c550813221895f0f99ac49cc26d293798b731cdf30524c13a79389ce07dd7e44
 EBUILD warlock-1.3.0.ebuild 1031 BLAKE2B 1616b314bf019cca4ac62db5a3790ba26d2d88f472935b487c48dcbfcf0202128f3689cab69dcbba0e7d8dafef978dd728cb91ed0c93b1cedcd4daa835ff2543 SHA512 a09ffc3cf51e6e8a451936891435ac74518932152f567efc104d7533715545837feff85fffed9b03b90e8e46ff18d6073fc08c181aad9d903d6d42c805e8831a
-EBUILD warlock-1.3.3.ebuild 1033 BLAKE2B a432c398e12d2d3462f83d66b428f5a52d98a8634a2bb2a8bbd03e53ae7a5d3db8871f28c5138ab43bbce4c8800e4b1da6b486672c0354b2091ba123a72469a6 SHA512 2ba896b759fe1444bb0592f4836ebecd649616865b417f3eb38f60861ccc657104bfa5c398fccac75eaa575a7b9616874a6f1ff6313c266c1443c43a599c8986
+EBUILD warlock-1.3.3.ebuild 1031 BLAKE2B c71c3f5b5b19808ec8e54e1e591d2bf2d3fead5a42ba62e72d784896ae3623e1348395d45aa8cd1f3c90ac63474490d25a9150fa46074456f8afcb3964a04370 SHA512 0807b3a183e49c4f65d155b3a990670203d0df5462d887979e14332c08911673741e5c5160cfd85924701dfd828d5626f8cf55c7afcac2ab749d635d8569f07b
 MISC metadata.xml 481 BLAKE2B aff1012a1482024186193a16b8e8abab85b300f76ef10a235ed9a40cc25586d4fbf632f37e2bb5a050478c74128cf0b2243345429f6edaa9a5a4b53276637f1d SHA512 1ec1e5a94f222a031e0f73c06c60a76d1e16cdb637d4ade4f0fd1deef8d51fb35cec46de7087c245fe68b8cc77637be822fb7eb9aa6b9379331a797d4e3a0166
diff --git a/dev-python/warlock/warlock-1.3.3.ebuild b/dev-python/warlock/warlock-1.3.3.ebuild
index 220218379d61..78a90ae596d7 100644
--- a/dev-python/warlock/warlock-1.3.3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 3bc2dfb23eab..d103c540dc40 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,7 @@
+DIST watchdog-0.10.2.tar.gz 88902 BLAKE2B f6fc6b9dd867a69139289fe6189f90fbc35897a63db1685da85960358141e5eed8391c1aba0cbb899b197056ae80141795090de7f73d821a1819b5c63361cc65 SHA512 3563a9686ce304350f33bbf4b16933cd0db5d6ab17676dfcc779b86cf9ddd06c42462ec40ad5c046cf4aa4b603aa477865de45daef05f9c6af3a441bcab16dbb
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
+EBUILD watchdog-0.10.2.ebuild 887 BLAKE2B 4ff6f7b6e02352f34a22fe8259c6636a971bc07fa2cfdd5cea20332c71d4518bb2c013d01fee26bff3abb84cb6f4f5830ddc1511f111f6b9c664732c4c8f23d1 SHA512 dbb0853f88e75a34d59f0c56daa633371e9160a48c727b021f1e01a29818cfadf4f076a9e2dff2f3cf111e47ef250dedd20e95358c026c2f445eb59ffcec4795
 EBUILD watchdog-0.8.3-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
 EBUILD watchdog-0.9.0-r1.ebuild 845 BLAKE2B 99fc184e8f2282d5e7b4291f7215bb6fc50accd843aa3b1b48150598bbf628ec9d37ab74521247de0d49f3fbb321f5cd518ecb6a04a0b5bfb5b6fb47c3f8bf9c SHA512 a2efaa1b2f6d6a8d21230a64deb919a52eb5289d56f94681bf3a10ca863451e9988f530bb64b20780d12fcc0b7c56c3e031b70001a6707b523ecea7c751f5562
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.10.2.ebuild b/dev-python/watchdog/watchdog-0.10.2.ebuild
new file mode 100644
index 000000000000..6420d472f83a
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.10.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 eutils
+
+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}]
+	dev-python/pathtools[${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
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index dbd39de501a3..68f6c7606699 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,5 +1,9 @@
 DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ceedb3d05eeaf85f90c1157e21d00ee8cd0f715098bf65e5d699a40287ce08e235f2f1d22a73f6606f490a921d SHA512 b828450feb56b5c0e686f6922e777ab48d1336816a41ef4ef95f71c25a37ef492861634c16c788e1e4570d21bd4d45c990a18787860ba6043157c2781c78b65e
 DIST wcwidth-0.1.9.tar.gz 24764 BLAKE2B c7a5a50a8628649810dddd37b1af4c7ea52b2d0d2e516bd24e04675849e6f402e6ef4b7cea0fb507c5446b455d8725f497771bb30cd4d7eafa90cbb6fc2d01b4 SHA512 3aee69efb8714f4426bfd424b80f4f4e5758174d84f725dd0e1448de1b4b4dd385ffd4f72440d5f763b7a82325857e9164742dbb7fa9e15d5db54744c262d0ba
+DIST wcwidth-0.2.2.gh.tar.gz 46929 BLAKE2B 8dac0a793417b04aaccd2235bdd3dee30e18b068a41e515934d2e7b6efb354039adba767db011a2782c9e1f5b8d2568f4ef73ae09361bf8f608491d252bccc21 SHA512 e644a8f83ac5974174e7dae35784c4f9310e39fcfd49d98d6da0f59efd19a0734d5c65e252689843346eb6adad62edfef76658648b34779191fbcf0655188d52
+DIST wcwidth-0.2.4.gh.tar.gz 47355 BLAKE2B 152befc1f9e8630f407a78c70c9121dcbf27a9bc165ef82ec80a6e0793eda5fa89829542dc14959eedf9cc7676edb0212b29bac95c8f041b9f007d03d2a05852 SHA512 69123170421f7f37a9d09e44860cace29b303701b7be8941d7af403b0f4044b273c136da5726689f13c061587fda24f944ef1da918712bed0eda8c00c7a208c0
 EBUILD wcwidth-0.1.8.ebuild 551 BLAKE2B 1d03df81db5ec03f284bb30d9e26722bdcbcc691c9d8af0ea705bc709dc11e7b17b8e72ae08669d0cf3537a9027feb656b62d297046caad28e3fa7a9f8956dbf SHA512 d1e11dfc2d0556a6823fb23c81e284b0bd1171a6ecb6b4d251965c507373c1df3974e79576652eda7b9dff5e108184aad64ebbae89c224cd4806fd623b319487
-EBUILD wcwidth-0.1.9.ebuild 562 BLAKE2B 8b0c1d9bb8cfd2d55b46af491a3768adb0fe1983f70d3cb419bc8e8f8f51c95e2212bba0f7e7986b3b24cbcb70dcccb0bd691174e98b05da46a14832b4169ec6 SHA512 977840e660008850826552c2313aaa7030d74d45b44d84ff63ca3181bb0d773a65274c664f7958f405ae81de38f03220861c17588d354c687ba0559c37b085fd
+EBUILD wcwidth-0.1.9.ebuild 553 BLAKE2B 82ebb496ee479b35aaf0eee2c4fd155e3fa1c18f9d78de3f92cb05fb423a546558af0b91d5a94a67cb53455feee8cd52ca4c1edb8243a89926f8bf50eca1f9a0 SHA512 7f4d8348570e79a419c4a5c00e0aac3ac192589c7df7f8f5249f05fe4c8f8efa8b65894bac31faebef2945e48e8e7db2a39a0a95a1f11bde234343a4cbe6e116
+EBUILD wcwidth-0.2.2-r1.ebuild 920 BLAKE2B db6d3bf6acc5fb9c02b01816656ce095a10d0e77f15cbd6dba46d1c6265c5a6ba19d878439499d3ebb66a6451ddc4206694ea4d2ec5223a5f1b419eaa4c18a2f SHA512 f13a5e8a7e1b4f2da68bbb7eb5d55f58b1ebb73eca618b7926e324c712048df27414209c69673387b18e7fae58f90e847213305b20f71bb5d182257f2f394aa9
+EBUILD wcwidth-0.2.4.ebuild 926 BLAKE2B 65e5b8e219a822bbd731421d89c439948524be31be39ab3b614fb255419a6bf5aaaabc9c50f39f4eee2f37f09849227866552a96022ae7100fd9377aa2fa426b SHA512 ace40abcb90d04554135d508a69057ed6b6bbeac76737c4f6b92be6512d6439a63943d8cc48f0576ece6a26e0020d92d1431513e3e004a8afdf2dbdcf22f3846
 MISC metadata.xml 401 BLAKE2B 539430ada34933bd8bebc7146f9fc472a9a6e076cce36d6e34026d54464da99cc520e3a473f246c807531fa7edbefec87cde6cb948c8d295f77aae122466a608 SHA512 d416016c92307a1ae828e8135fac401dca0c005d4d0739874f6cb90ef9c36b9f41674896f30298826b200aaffad674c985ab7d06f76ac8897e9dfe1652aba426
diff --git a/dev-python/wcwidth/wcwidth-0.1.9.ebuild b/dev-python/wcwidth/wcwidth-0.1.9.ebuild
index a39f60c13cfe..3b6f48a14745 100644
--- a/dev-python/wcwidth/wcwidth-0.1.9.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.9.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..42a66c084106
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="
+	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+	' -2)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov-append::' \
+		-e 's:--cov-report=html::' \
+		-e 's:--cov=wcwidth::' \
+		-i tox.ini || die
+	sed -i -e 's:test_package_version:_&:' tests/test_core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wcwidth/wcwidth-0.2.4.ebuild b/dev-python/wcwidth/wcwidth-0.2.4.ebuild
new file mode 100644
index 000000000000..00627f52df55
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.2.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="
+	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+	' -2)"
+
+distutils_enable_tests pytest
+
+DOCS=()
+
+src_prepare() {
+	sed -e 's:--cov-append::' \
+		-e 's:--cov-report=html::' \
+		-e 's:--cov=wcwidth::' \
+		-i tox.ini || die
+	sed -i -e 's:test_package_version:_&:' tests/test_core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index 392d54777ddb..526ed1692dae 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,5 +1,5 @@
 DIST webcolors-1.10.tar.gz 36108 BLAKE2B 9856514e90b5ebd82cc619e19637db1862c5f94230e000c6779920fc84e1e690d5e34f080c5fb1f5a9f71769597c349fc55e12d339280836a47969314e63f6c5 SHA512 db02dcfc542d1fd08fccad815a02cbe01012a942329c53d468c7f9b6e0d628dd38abf4b2633bc8992fb914932ca4455e54c7ef98e101ca86d34825edfc3c1feb
 DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
-EBUILD webcolors-1.10.ebuild 653 BLAKE2B 2b4ffc040ce763a29d4addeebf0cff3bcf3bcad073ec2d70621ce5faee1fa6976f0c55d67cda2e71c3b97e9b885f2b60698fdd457310c2c31ef11ee765d72bb3 SHA512 234f1a9dea74bb494f94d3c59897458eb57aca68e507fac3c7eb1319ff4d57c46e5ca34abde3f823e5a7fec16694c19c8a2893414d7c2c5bdf36a040791478a5
-EBUILD webcolors-1.11.1.ebuild 606 BLAKE2B d0a614a75f802dc197c7549f0605bae90b0beb930ee7655219b20cd15d40b7e770f1e089a41c0d2bbfdbdc846d5408b67ec14b863ac86243ef3a13352f0fa6a1 SHA512 d564922623e1335a1bec812d60f24c652495042a3bfe06f2c1367b86d6e6700f3304b5861a52f60085e17faa22b848249a7ce0d16217d1f89ca6ecae145518d1
+EBUILD webcolors-1.10.ebuild 611 BLAKE2B 6296e642f4cc47678435958d583ddd7189774e4003da333345b550468c68464224c6b9e5aed67a1ba8cfe528b52e7fcf73d360e548f2bb9b23d31327a18ada30 SHA512 ffecf7a0020b221944c31f515f5e91936fab9d3dbbc1db6a497fe3e9038acf2804c3d95dd1bd06a10a1cd606c65de115d929e78ad11ffd0fd29c1e7b3df1783a
+EBUILD webcolors-1.11.1.ebuild 605 BLAKE2B 92eec5251d209b91b48c9c23465f0bcf06aa34ea60ff341630bb59c9f020c14b5e20bbe4813990abcffdc410432174992742bd2fc899a07b552d95c7859bb763 SHA512 b4b3c1cf081986e27cb797c9d5ec2765667502c276425c81b79878657a57add681cf50927b3a78cb868fe999e4ef11762e9b542d78127445ae2bcf15b5271f69
 MISC metadata.xml 397 BLAKE2B d7490a40883b9fc8ed2871441e94afa18011e33f8d3d2bac6a08b4312b06599e01a176630c6492899bfcd87d3b48c62365a0a676a3c99b8e1cbf0dcbb64da08a SHA512 adec8b9b31a3c7ceb198f236366cb1bbbd40948d3fc21e6366b9a36ea12e41268674bd5bf0eee1854f0e5535d24e31c2c5cbedca5bf5f2e10d798e5ce296ae4c
diff --git a/dev-python/webcolors/webcolors-1.10.ebuild b/dev-python/webcolors/webcolors-1.10.ebuild
index 4fd92f81edcf..d16c23c3814e 100644
--- a/dev-python/webcolors/webcolors-1.10.ebuild
+++ b/dev-python/webcolors/webcolors-1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,6 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
 distutils_enable_tests nose
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index 59a073dd61ca..d59f5a1b988e 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 44f2d81cde93..925b006331df 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,3 @@
 DIST websocket-client-0.57.0.tar.gz 39333 BLAKE2B 3e24c41176e0566edf0d31bcbb0ecd69d368a7ff879ac7ab8e4b170ca356b0ea50aa0b6be845e76ecdd73dff9a2aa38c8cdefaa202627f9f9d272989114fe94b SHA512 8677b00abbdd995ef1c2254f73a01713eb0707ee2549031f410205af7bbbf57b4730b38a78d683a90605c1412863f57a3829d8be1c058f3e9bfb177bd49c4525
-EBUILD websocket-client-0.57.0.ebuild 817 BLAKE2B f654592d4b2ff833a818375554c7ac55cb6902ec2471088ba527e5a5afb82c5b4e6c1a49e95eb56f7fd2c254e69f877296692138e6b5b6c9046ab1e4409cdb38 SHA512 3c0547dda64e8f933e596309288db2be5158d3a6f6bf383a02404235a0398b1bcb689f0bf62b5de41a8cabcb5ed4e29ecee20f9ca9a1e61a0b3d363898bf9ae6
+EBUILD websocket-client-0.57.0.ebuild 757 BLAKE2B 7fb5f31c189c98e0ac0ccf5d3e416a2e934afcbeafec741fef2c005909fb183854d333102390dfc2bdfbbb39e598082f43ea3b0f58d4d01ec4796e3403cffc4a SHA512 b49bf262f0cda66f43afcf74cda9d571fa966a59d2b2c6535546024953d06e3dff9093d8b0206a46a0b3ec6cf7cbe6cc7293da06ea8079ef4c09819c12d306b7
 MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
diff --git a/dev-python/websocket-client/websocket-client-0.57.0.ebuild b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
index cddf08f9b26b..5d0a7e635b1a 100644
--- a/dev-python/websocket-client/websocket-client-0.57.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
@@ -15,17 +15,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="examples test"
-
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+IUSE="examples"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="
-	test? ( ${RDEPEND} )
-"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 93275781d617..42a5551c5d95 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -2,5 +2,5 @@ AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9f
 DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
 DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
 EBUILD webtest-2.0.33.ebuild 1411 BLAKE2B 10c8762873ce7fb712480e3e9ce6cbcf848ed9a3db274e2306a09bb496dd223d29b40eac61604283f9fbba222579bfc8f6ba55b5a3bfc2355d561d45ded511e1 SHA512 da877093e91a7d899ca6dec376eacb2a65a9d26017b20a1c18d249ff33c498baf893d3433ca6e3c5561adbddb32d30584f9d1b99b67217c55d05ce82bcb87c89
-EBUILD webtest-2.0.35.ebuild 1162 BLAKE2B f1fda1ee580d5a4c79c3be2c36633ddd5e5480dafca14f52ef37cb6bfafd7ae68d5f85186506d1ab0956d5fa1bd646b5ec944726b58f5c18ce445ce4b7aadf1e SHA512 b42c00e6957cce26bb99243af8099d74571cd52f6ed0c2935d34e769347eacbd9974bf4d0485e28add61fa2cfb6d9f2e1a2767eda2b8530a34ed5f1b9d4fec95
+EBUILD webtest-2.0.35.ebuild 1167 BLAKE2B c4c4c20f74514951579f99486386e0dbaab239c34cb08bdfc8edc73b180690f586cdd868e3005b7dd0ddb32cac65fda46d8b368b6254f1b500494e605ae534e2 SHA512 c273fbc09af634c2a5fbf0ad4d0df303e26033653ea81679846e7eb16625bbbc89ac7212b84692d3760e556210cefc40ac50da35b05a1b244b93780491d740d6
 MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 2b07d79efb43..2f10b3f2dfac 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index d049d8a9db0a..ba9a9b21fc78 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -2,6 +2,6 @@ DIST werkzeug-0.16.0.gh.tar.gz 939220 BLAKE2B 08f77bfbb8703b25be00dba018e9aea16c
 DIST werkzeug-0.16.1.gh.tar.gz 937876 BLAKE2B e5f962e9cab4a06a6f2d63ac35df896ed764377b458ccdc744800ffa5d2d456a836f0a7c4aef08b750b95904e955ce3b0241102d48bd28080e91fe29823e789e SHA512 52611b2e22b8af6b643471ca1df6e6f262067ef8882363768f21d9b0ee837aedd192c358a3a41788b2036d6c6cc0156043f1f5b8f6a04b2a701790b66837a62e
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
 EBUILD werkzeug-0.16.0.ebuild 1173 BLAKE2B e3bccc385cf6fbf35d2ec9dd5a162816756af220f6b272ce8184877deea82bbfdef159c7dc4da20f9201d193ba3b66e338dd68e978c66876d836a32b21605147 SHA512 14365bd1768d04ed2968043e74945a36ea3ca879b83125f9d21dec62420dc6479f09f8a70196491df4d6d81bd45e01ff664be7bb353fc50f541840df643fe612
-EBUILD werkzeug-0.16.1.ebuild 996 BLAKE2B bbfc072cb41301aa796489cfe4c1dbebc537a9fb60f1a501b583dd2cd1d0d8c019b0495041a34883b6846d2ac6fe5194a00eecc4466a6b1cc658fbecf983e14f SHA512 822e8dab194a0a5f29700f6f7b9866174e6a2150cbdbab1bc086b0efafb58d58d006a4ce04dac3c6fd164a8f21ac54c0f861465cb5a011508c40e0d8a4edbbc8
+EBUILD werkzeug-0.16.1.ebuild 1001 BLAKE2B 90c598018f5e117d58af89ebb846e4fe4bd30299a3898a0f27fd085a891ab9f782fee565169bf03a40f8d385e7fc4bcf41ed220deef3de50c5f290c5679d3d29 SHA512 409bfbf53b3d73e6364a9277f2eab5761da10b9af3a82e0f74620cc520f8e32d7e7fd64d30b0b816e6bf5792e5c84cf52e6e522a5f20f2e3ef70972f3c2d4250
 EBUILD werkzeug-1.0.1.ebuild 1361 BLAKE2B 100b836e5e9d67881c84cbd9530a0a7bb7e5cfaf67f29e26c8da45242351bb6b1140b85301a43176f5f89a262c078fed04c02e333fcb4e20b18aac08d7c47ecd SHA512 3f29354a35257df34a2c34b94ee3ac4397c60852c2aa3735f6c7f00816ff895868e3879a5c5a1584bf98515278b62bb8fba991500d90c61e4393e81c1c84b76e
 MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
diff --git a/dev-python/werkzeug/werkzeug-0.16.1.ebuild b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
index 38f1046956dd..7bc514bedc16 100644
--- a/dev-python/werkzeug/werkzeug-0.16.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index deecb65bf007..9ecce7676eed 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,4 +1,4 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.7.4.ebuild 988 BLAKE2B cb9dc11a0fbbac0b6964ddcab46359a9123a1d76be6a63cd467b5eef57cf3d55ffffdf09af013ec6de8d12a322ab9ae1d2e0e8a686a1e9f21b983431527f4ce1 SHA512 487a47cd68d2fdf892ba22ef21f46dddf05601bdcc2c40123956523b8fa5c241ed2d3d4d87d8121d6cca25c66eaf932af6e3f139d6232472a03fa53c97c20516
+EBUILD whoosh-2.7.4.ebuild 987 BLAKE2B e80e50396192266843f1114d004b12018c09fb5ed14e7d326c54fcba4af4ab63f77b6b940b85f64e88d0fe5d8c69be551ac079624014266611f11b03e873c15a SHA512 5e86ccdc0e0817437e2be64d7ad2105095a8e4d7917b743d775e03ced11692873e43dc98eaec28f7cd045e2ef672513155be1a731757035526bb4d227338f109
 MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index 3ca02d1cda5a..a445686a4f4e 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index c6a5606314ef..c6bb92365084 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,5 +1,7 @@
 DIST widgetsnbextension-3.0.0.tar.gz 1253392 BLAKE2B 88d435b06fcbf759f7ea919ee69d3523f86f2a150bb7d411d9f2a41f9e4a6176a7900595ae5bd30232c203b81f3462a1178c001fbbf456f847597b0acbd20f12 SHA512 079a2ce837e37a8d1707b6686e5c23989bb79af298847ae6bd01dd0f6e570f91e86ff53ff4aa3a8cb4f56f895e3839ef96c722bd156599eb01893870aa1fb4dd
 DIST widgetsnbextension-3.4.2.tar.gz 1103610 BLAKE2B 1cbd08dc1b9e4a8350b2d3a6e21ad106cacae8da308b82af5c55a7d520fa0ddb6c82cd7aeff7d7521430bbbbed2aaa276d869a8eaa1122cd5a3b8f69e1376352 SHA512 e50daec0a6fc7df2317a1c90ed7713057b35e4c0aba626cc70a9d886aaf0c6ec3f820344d1e1e79b7895de41b6721dc209278395cdce61291bd03ada51c14613
+DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
 EBUILD widgetsnbextension-3.0.0.ebuild 479 BLAKE2B 779446ca8c8a632a29d251dd2b396cd962f779bc018e22cd524238ab2f9f30d78517f0bef710a497417fb5bf755f23520057e080b3a1a3a566cdb85f0c27bc0c SHA512 96587904be55684d894ec1536cedc388b1d3962bc0e9ee7d5de87c56b56d431f4e807d973c890db596052d30ddf71b16af1ced128f5f29e5baba52712ab9dca9
 EBUILD widgetsnbextension-3.4.2.ebuild 473 BLAKE2B c8027dc2693c744a82bf15dccb866c2d5b2ac331ee4b6551413061dd851e53befd5eca5a1b4354781f658bfc46fab7d256b1a2207263599c4f6eb3b6e3d1f81c SHA512 9d378e8dd0f2aaf1f256789c858dfae15312b3404d20676857fe762c5b3c29f330a0902b03b00abe10d634e8d41d8b1b12f907a9858c1dab41365755775a8042
-MISC metadata.xml 505 BLAKE2B 7fea495f73e9db9d002d432894dcddb9e9b86cb4e38bd96e9841b4edf5338e659e440b9a47abef5fea5c4d04ad27d91f9fb4583f8ef334c2aa12d39b08fb83cf SHA512 4e7df3a611f92efd9e82d7fa7cffc23f1b90d93ff5c03153c4d34dff6e0acd862f56a2ee9a8a049e213d191c7f1cbd364572b85c6e7df9b3e99d3dd743217505
+EBUILD widgetsnbextension-3.5.1.ebuild 482 BLAKE2B b6a9c8cf3b7a2dd8b044b3734cbefad035445fcc2b4488321fc463dc94482ab76a3d737124dfb01d75818b9373b86ee0ebd606f1dba83f160f394a38edb28aec SHA512 c96566b4d15c612d1161e6c51a87316d664eb32db497bfd617d988fe9c2c8a27b40d1b01ccd93b0b0e544c88b49a55935013fb2eb91af4ac6e15a70fcf81b240
+MISC metadata.xml 519 BLAKE2B 592ea12fcf1d68154b5e993b0aaf5370e3675c6fb0151800b777e36d35e93f59d4126167b6a00c7ea0c4fd08469d0a5d14c9fc9c5ab7759ea839057d021e9824 SHA512 abe9fb9ee0902e30755d996d2886ce34419bc6291feb9c51a91d374675279fc7e03850c0a6f319a034c5fa5288797747a67a5b248855622e15ae9444264fac76
diff --git a/dev-python/widgetsnbextension/metadata.xml b/dev-python/widgetsnbextension/metadata.xml
index 322ca60a938c..1877c69f73cd 100644
--- a/dev-python/widgetsnbextension/metadata.xml
+++ b/dev-python/widgetsnbextension/metadata.xml
@@ -5,9 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    Interactive HTML widgets for Jupyter notebooks.
-  </longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">widgetsnbextension</remote-id>
     <remote-id type="github">jupyter-widgets/ipywidgets</remote-id>
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
new file mode 100644
index 000000000000..28147f8a5302
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipython.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 96d23bef0c1c..fd1d0b6afeb3 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -2,5 +2,5 @@ AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944
 DIST wrapt-1.11.2.tar.gz 124874 BLAKE2B 262518e097753830d80d834e1dcd5afe9c743e7cad8fad992146829255b99ef0c1a6d0344674935bb6beae9a8e5f42a1a4ade760f7300d104b1a17bc6f94f91f SHA512 2551247c46fbc34068e0f2d6efa91d8c87669c8bf1e16c3b5e2e5e0d84402301c38a78485b7e9a13120c99c9c942db680a84d87a52a072d530aba6444d86297d
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
 EBUILD wrapt-1.11.2-r1.ebuild 711 BLAKE2B a10d2574450e0b90382a0f5d518785492fe071dd93015ed1b760d6809bf221babee875b73218675be73d4e8bb32ba9513ec8b81a5573cf2760560db61596bed3 SHA512 4cabf49d48a79d852b920bfcd948cf5ad89dfbd1075f0eca224e893459fe28ed736499928b1fef83f3026002d23858c3373495196cb1b106144e2bbfa2ac961a
-EBUILD wrapt-1.12.1.ebuild 767 BLAKE2B 499e13e3dd48e2fbc4e98e75552e0d7f74863de4e89999cccbbeaa15247e53a95085827b77590fb1d42ad07d771b1214a7c4664a32a7cdf68bc47014667ab2c1 SHA512 b18e29f05fabb55dbf8f7812d0528af6d37a9f64b7b8970d6e794f07841c06071c31be0f52fca425b2cbacecc9e5981f73f64e68c680904d00f575bec77f25ae
+EBUILD wrapt-1.12.1.ebuild 773 BLAKE2B debb489dc37260573be7c5ddec7c03276ba9b5ff8f69e3ad4b816489e34b63753fb6ffc3e26b586ab88d38b33277262e150e08b0eb6fb1aba5f1f7622efdca7d SHA512 c29d7592cb02f39a0d38a1681f4c96e3cce41f74b51a5047c9272178073d987ec0aeb205f44c29e70aaf1dfb71f79b161a84d4223694661de0ff352695e0abad
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index 24fccc88aafa..477f6b207dc3 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index d9b13025d129..6d96eaefabc3 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,4 +1,4 @@
 AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a68061a4c68162033da329068838ea262f231a07aa6a944f9a9889c415af0c65eb3c885d9b69d9ee3fa8878003e886545 SHA512 960b5be5e67cc77d86c37ea5f6966ca838455cea74d79288e245acb47c9b374a285a3135c39330b2e8928760fd244e8addad8e4f707b7cbee1dc4801562a50f5
 DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-EBUILD wsgiproxy2-0.4.6-r1.ebuild 1093 BLAKE2B bf0983040a13292fb136d422ac458fbb8e181e4bd2261b30eaea632ab382f80c8654e239c468876d7e16b2fd72f6d59df9ae37efff054431f192a633c4c0a8c8 SHA512 f7819163815d963e188a93d5927f491354d85f5b7c4535c131a804bf43a43b517c3fed8160aebd6ed9e46a1bb5f6777a4bd5a3e39be5fbdbccc0ef83681f576b
+EBUILD wsgiproxy2-0.4.6-r1.ebuild 1098 BLAKE2B f3f6f464d95e0b134e0925ea986207ace8e5dd1f75d15c098ee07e32418b997e433967c7c3da7cab6d687118fd811e173f357b9e7d2297547b1a8a6503d3b3e9 SHA512 2e530ca9e45106090a7671fc811aa8852cec35e83a9dc6e9a571b7f796639660ca4f8dccd1d04efd9749325d01ef4d75bf2666e8773ae0e730cbc3308c49868a
 MISC metadata.xml 337 BLAKE2B b34d470df573b61875a4d4bbff338d30a9bb21fc1905a73e47639fd9f3a9c3222b8d5dd54daeb37228dea119cdd354d618cd544de3ab7b46b826f70faaa9add0 SHA512 85c5219804c984dd8f028fcafd94476d0e44a09154d852fcc86194f6c1fb4dbe47228346be487aad7de0588079499c8e47cca0166721f519a8a99cb359fd4f03
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
index 0995b056c08b..0f5f947be439 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
@@ -15,7 +15,7 @@ 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 ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 6bc94f6f2778..654ce41f6b90 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -9,5 +9,5 @@ DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e0
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
 EBUILD wxpython-3.0.2.0.ebuild 4581 BLAKE2B 02226950f5f18aad9261b59c0310c88427cd91362d97c30e8226551ce038a42ce054092418a26a64f878cc3317a524d8ecf67135597fb0db1ca4ae00f6251aaa SHA512 c1edff5306233fd830b847a3c7475c5e7822b501ff117022ec572a02d1cbfcfc003e717705d3d5fd0cbdcea783e2471d47e98296b9d83a52eb9c83dd9b94231a
-EBUILD wxpython-4.0.7.ebuild 2267 BLAKE2B e450f866f7f000d56599fe61ded194159a5cf96e1dd496c6209f9938c8310e38dc016d42295ee55d04a108e3657c5ad8943e1d5d0a44c9409b3bb299f0ff7bd4 SHA512 6a60acc465c823c5e3b2755d7103372aa64191bdb6526e0d062ecd6b17455897e5a297b7e52ec46bf01ae769148f627cb62f52f9eb7e04b3134a4f20fd017626
+EBUILD wxpython-4.0.7.ebuild 2266 BLAKE2B 9f4492107d916e72b360a8408c703f12a8ae3e9e11041a9fe8541acc0f6a179be6cc4053452861cce50b71f710960c5c801e38968802750da369be3048a03251 SHA512 e354675d9312c41279bcb710f892eefaa120cfbb3f1c87a6f484e9b202658fcce8e9e8be3e75c0f7a2a31d7c1605b43107104117929815b45502357b0716b306
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 6d49fa8e3eba..32ae9484d2bb 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 6180f74660c5..20b2121c81d2 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,5 +1,3 @@
-DIST xapp-1.0.1.tar.gz 12327 BLAKE2B a627a833adc8ca32823d4c04fd65ef3dedc2eedd031c3030105f1f2341fa17744fc81c976f4eaa1a238653392510d416692ce804ff5bcfe9ed12d9595245e8d3 SHA512 7dc4db03476f6972f6452800d2ea58d7f78d0bd5dd6719f2b49d1c2e3315c3fa09c294b1195bebd26357c30b4c43d7e5c01d160708dd17ee488b823344895e25
 DIST xapp-2.0.1.tar.gz 19839 BLAKE2B 692ef5a560681f415ab211b6f2870339dc80ca3ce90ac860637ce6765309b03f8ac41499ad5bcef51cde194b7cee2e3366abb3ddb5ee7e2212e3dac0da625387 SHA512 a529680ab2adbcd829ec224b7dafeb5f641afaabd51ac6cea154d1adf46772b0f2c58a78c6f136d3c6dde0b5d69a4e53a988f69d282af852ecf9ffa130ec1fe4
-EBUILD xapp-1.0.1-r2.ebuild 539 BLAKE2B 8b7986950d82e88b26508272a707f42a5ca788e361d16d7fb5334c2cca8ab40cb5cc13be457a4f3a43a969df0c6b9738114c4774a9622835b559ac3f756ecd8b SHA512 a6f92d911cfcf74e93bc60660d96d16b08f69658123299e3281fad32e2dc0a646331d8e4ff01eb75bbaac1dc89fbbf6d6ee38284fd78240df16208ad3445c379
 EBUILD xapp-2.0.1.ebuild 552 BLAKE2B b31f8e833684636c9f87e100e0343b9943a0baf9806a8bc2d921e7999a13f0a4d466d9eb901b069f5a5e0084ab90a71579b7bf547845e32b55a29d3f2bb6a714 SHA512 39b2369f25cbbff7f189674a263307514d09f9e93dfe5ec3c01ff616cf896f4f3817f70343f02b64b84adb784059a0f53529b4dec82e9a878fcf7fa82082b448
 MISC metadata.xml 697 BLAKE2B 46fd11d93f7328bbe2f62bc5c02ffe5853a0ff9e2250bdb7e8083c21a5142668090af8d955db323604a035c0adc400820cf775014cffa28af3a0ec4ee0405f9b SHA512 df90d562f1a1d8125b8c5a565cd19b343f9cf2d56a4526969fed9edcd8de01ec4856ba88858b4908b4366f646b1e6baed1ace3945452e487d69bf1dbb705498b
diff --git a/dev-python/xapp/xapp-1.0.1-r2.ebuild b/dev-python/xapp/xapp-1.0.1-r2.ebuild
deleted file mode 100644
index 8b3cf6257741..000000000000
--- a/dev-python/xapp/xapp-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for x11-libs/xapps"
-HOMEPAGE="https://github.com/linuxmint/python-xapp"
-SRC_URI="https://github.com/linuxmint/python-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="x11-libs/xapps[introspection]"
-RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/python-xapp-${PV}"
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 1964fea217ce..6e595000ef3f 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,4 +1,4 @@
 AUX xcffib-0.4.2-test-imports.patch 902 BLAKE2B 386d1a45dff2454925655b09f8dabf8159ab3be6dd0750723d0f70f85b15f75b48d7989d37ab808a090bb4723ae7cbbfcc271eca390b1653a10dc2244ce0564e SHA512 f08590fb2d5979f464d56f9c7e45b83f20954005980f98d2ee3d2c6ce5c44554431059fc911040943ecdcd4ca786c345bab6bae733a46379ad58fa487d516697
 DIST xcffib-0.9.0.tar.gz 83063 BLAKE2B 898fbce1ff503a9ad64a4c34778e0b5ffef531cf2ad04327f1890c87adb5f91287465e39a981a3c5a628c048b8acbb38bac3b0b76a58c3bbe45ab34c9a5eacf5 SHA512 e5891f080fcf1df596c37bb64a70e0de4a41d83b4675dac3b1c128656ab1b09d865e3ab0bfe0e5cc523e89a75dc6127dfc455ab66ca543ba6eeae9ee5bdae168
-EBUILD xcffib-0.9.0.ebuild 871 BLAKE2B d261f7c1d3859889c011f9c8fb2f975cb6fec8741bc37932ab708923d75191275ba503039662b87e02603cbeaf2866c670a949ec5e02bbb3520a43080eefc012 SHA512 1af82ea881608a1c3d60e026a65c723854c72c00848b5929d03fa728cb3cf9eefa86e8380352a832d4129bc17bee57acd05b883cc22f095756bbdbeabf9b8846
+EBUILD xcffib-0.9.0.ebuild 762 BLAKE2B 0292d0cd3101a0b6d7fa2b7b7dbdea76f99500a0b31c451babe58a4a9df2f62abd7623c0934e337f9887d53b3b310f07d24de7a9c301d4f2545fc4d2afa97eda SHA512 3b9f580fc0a743166b9a6bb84d6c53530a930c7707f2d73e61589a4990136b04dd1efd997f6d7d42d61e559a13d55aaa561c7cca4a84b7c660bca7c21b777c67
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.9.0.ebuild b/dev-python/xcffib/xcffib-0.9.0.ebuild
index 014ddb3a75d3..733fcfb15064 100644
--- a/dev-python/xcffib/xcffib-0.9.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
@@ -14,24 +14,23 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
 	dev-python/six[${PYTHON_USEDEP}]
 	${DEPEND}"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
 		x11-apps/xeyes
 	)"
 
+distutils_enable_tests nose
+
 PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )
 
-python_test() {
-	virtx nosetests -d -v
+src_test() {
+	virtx distutils-r1_src_test
 }
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index dcc5879ba10d..ccdbfcff18e3 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-1.2.0.ebuild 760 BLAKE2B f1529fcc7503edafc1c876f3d3d35960c934d137469ad887318da172cea196eb73437930cfb96e778fb9db23401cd5cea2f1f797eb8c65258a27e3ea82a99f18 SHA512 757e1ff226d7528698774a0fb46040853ff20656458c40d3a4dc7aca433927a2815e7dcbbbd61aec5c6b710da0b7a70bef6208676e0c1eb835307e260c983c9f
+EBUILD xlrd-1.2.0.ebuild 645 BLAKE2B e117b31d6b534175470ade71c870f5343c8facc186397b06daec7d89315eac3c8b9b9af9560b4ff933e4a0245d6c260c5e7bf18fe1f822998db0f40b27351aee SHA512 f86c8e58fa003af4127476fefe79783a2b590cbe6263e21202933ece387edbb8fbed525c77122dff6f752b52c74543a6009d5e587c7626e5a2522936dc73fe55
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index b3782f1a8139..d2dac8fad320 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,16 +14,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests unittest
 
 python_prepare_all() {
 	# Remove this if examples get reintroduced
 	sed -i -e "s/test_names_demo/_&/" tests/test_open_workbook.py || die
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Test failed with ${EPYTHON}"
-}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index efd8123917ef..42cbdcd27308 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,6 +1,8 @@
 DIST XlsxWriter-0.9.8.tar.gz 236187 BLAKE2B ff6f7392a72fe00107d2dfdc17a4d17f6505f9961e518115bf88412194ee8f32364709ee3da0756a7de038f1a699e32c000831b58aabe608564aa7171c20f702 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894
 DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c6eae33f4f303f2c9b7fc1bcd661e07722031b8eb35e7e57ffb04c84f6121f3f304c40379f891a0f9c50667503391f8e6d SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29
 DIST xlsxwriter-1.2.8-tests.tar.gz 29222574 BLAKE2B 11a13c5fc4089c8c15dcaa069a6f044555426e71dd040a6abf1038fb2a33788744c80487abaf1da6b3c0fae2db55a389c0cedbac251c793dc828920ea55ee5b3 SHA512 2269235ad3bb243dd8be5cf33efb6503e08e3d7ac42bce042c97737ebb8a9db880db93c05bbb2708b0bb6c621cb11c91f3e7d5b4fa09fce88092b365910b1afb
+DIST xlsxwriter-1.2.9-tests.tar.gz 29395878 BLAKE2B 010e3baf191dafe04b4c73986c7997048aeb1002515d24e104a241e7bc80c5e3e4e46b2454e01de72e23418a24ad981b758355dc77dfa1980265d5b119e7c247 SHA512 4680f2eaa96ec8063432f3f0642d27895cd462d3d9b664a452f8e2956bcd16268f41a5780d172cf61cd3951f1f5fbc2dc904ebef1e08e7f45269821a3157c7eb
 EBUILD xlsxwriter-0.9.8.ebuild 952 BLAKE2B c31d7bc21c3364389e8e4241d68e180915c3a86db13eff01c33284262c9008e09513f49f0eb5d6b12b4f5a6fe98ff06ca2afe54cbbad3e1d917d37f740b0085f SHA512 cd1b9969918b525e4256e5a665021089af8aa9df7df21a95e4f20d73d9e54d05606665cc831fe3645c4b867db78d5a858a31dfa60b7d047fc340c23c025d4ee7
-EBUILD xlsxwriter-1.2.8.ebuild 574 BLAKE2B 00a730f147a4de17288a51d3535147551a12f0080c86a74a338eba7a45f97362a010e59cb3001e8b21eb7160fcf81f3ac1491e239001f415ac4396cadc855a79 SHA512 efb524dea5852ecd3b60f538f3541a9b8755e0122a19d9e4ebb71ff1ad47327e5af5a8b671b703be86f31cad8bc29da7bf1a3252bea85f76eacb3d25aa3bdc90
+EBUILD xlsxwriter-1.2.8.ebuild 573 BLAKE2B d6766bacf1489be00509fa75413578f32203e83a3e4b87e865b03d7f756d104adcc44df89901f40ac8bbd3f42ae7c8e895daa8bb7c654ea3a62f3cf1570967d2 SHA512 68dbc36b109efa44a713cba1aee16ec114b24522a7874bf1081381c1a67f8261612f9b6846d77cf8f77fbde5c9b56eb03ac6fc106d0e04af2b6c16b2095c7a2f
+EBUILD xlsxwriter-1.2.9.ebuild 573 BLAKE2B d6766bacf1489be00509fa75413578f32203e83a3e4b87e865b03d7f756d104adcc44df89901f40ac8bbd3f42ae7c8e895daa8bb7c654ea3a62f3cf1570967d2 SHA512 68dbc36b109efa44a713cba1aee16ec114b24522a7874bf1081381c1a67f8261612f9b6846d77cf8f77fbde5c9b56eb03ac6fc106d0e04af2b6c16b2095c7a2f
 MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
index 1dbb888d8fc7..11100a0ce79a 100644
--- a/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild
new file mode 100644
index 000000000000..11100a0ce79a
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
+S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 072099821fa0..7a7864600e71 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,5 +1,4 @@
-AUX xlwt-1.3.0-no-intersphinx.patch 447 BLAKE2B 7d861dfcecf1a811c129569703dfb29bace4c8dd7de1b8bad89a4d93b03d80b7b79df5409c69b8ab4b132b16595d1c608885225ef41488382f4811147ae23ccb SHA512 f5c1e731a0a88f012dfc1b62ae37edc71082f3b6e5726389cf4722d69ce69821d1fffa8e2fb7537854325942c1157f68c168d8dbd82936918a1f164cd80f5010
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r1.ebuild 1278 BLAKE2B 6ccc742e1e4cbe1b67e720d0cb2552580bd1f777a1e2771df39bcbb912162a92bb5b65ce378ca12275cfafce06e2f5467ac3a63389df1eb065cc81755962fd6f SHA512 bc5f97258bde31c677aff4070fdb8d88af022a60a559639a6c940a76e8b447ae300a93e00fcad1d1979140746396cdc4c76d67f49432039557354d6ce7972aa7
-EBUILD xlwt-1.3.0.ebuild 1288 BLAKE2B 220c87972d7ada518b1dcf0d66f446e27c0026af65bef0875594b94d60eae60e392a9a3211e07b247fd935486f48db1b026879f3dff3fc530ecb334a46199ae9 SHA512 1fd23be2cc1dc966392558fc9dfb62d5ab8e8b3afc7ebbc5bac618043e1cb0bd8359d906665e7c37d76c68060d04020458f81dce63c57b6feb7ac9c5924f6f1a
+EBUILD xlwt-1.3.0-r1.ebuild 668 BLAKE2B a91e3aef63e45d2dc5d75c4c3ea9a9e5b33ff64066261c893707ce9ad4690424f550c45bb1a5c734ea54dbc30d71e75bb59f7f1abded921291556038e552f1a3 SHA512 84e80597e799eca160aca73e3331aa5257235d5786c6145586157eb59ed39f1a58a5efd718097c3179a563d5fba9ec31a82dbcb5c82bb147e3228ec1b11bf927
+EBUILD xlwt-1.3.0.ebuild 678 BLAKE2B 0135d432fc7b6201517636898201c172f4b8dc53682d93c74357b6674d71ee9c9f1ef3f353e58e5aeac5a4a3b37f3390971d323041b696d5bc34a2558e2cffa7 SHA512 a1baed50b5f4f7a600b79187a5e50f3b4450dfce6c4e88711aebb5cd176853532c76bc0a598e0c28532f71c0152fde055f36e6947fcf3f9d2985a24437370eb3
 MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
diff --git a/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch b/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch
deleted file mode 100644
index 2ef29a1d6cf2..000000000000
--- a/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index c55fa2f..25db355 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -4,7 +4,7 @@ import os, pkginfo
- on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__), os.pardir))
- 
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
-+extensions = ['sphinx.ext.autodoc']
- source_suffix = '.rst'
- master_doc = 'index'
- project = u'xlwt'
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index 748243eff07d..59d613cb1f5a 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
@@ -12,37 +12,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pkginfo[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Prevent d'loading in the doc build
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-intersphinx.patch" )
-
-python_prepare_all() {
-	# Don't install documentation and examples in site-packages directories.
-	sed -e "/package_data/d" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests || die "tests failed under ${EPYTHON}}"
-}
+distutils_enable_sphinx docs \
+	dev-python/pkginfo
+distutils_enable_tests nose
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}
diff --git a/dev-python/xlwt/xlwt-1.3.0.ebuild b/dev-python/xlwt/xlwt-1.3.0.ebuild
index f6160030c635..8c36c7f3763d 100644
--- a/dev-python/xlwt/xlwt-1.3.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0.ebuild
@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
@@ -14,37 +12,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pkginfo[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Prevent d'loading in the doc build
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-intersphinx.patch" )
-
-python_prepare_all() {
-	# Don't install documentation and examples in site-packages directories.
-	sed -e "/package_data/d" -i setup.py || die
+IUSE="examples"
 
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests || die "tests failed under ${EPYTHON}}"
-}
+distutils_enable_sphinx docs \
+	dev-python/pkginfo
+distutils_enable_tests nose
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 2feb4b80940d..76e6199ffea2 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,7 @@
 DIST xmlschema-1.1.3.tar.gz 298490 BLAKE2B 70c24424fd6a5e87e07591451db920d22c1bf2c63c1908e008401eafe210b759894ba508011ee58e2c242ca5b3d424c86cdf7a65312e9df1cda426802af8e861 SHA512 df277cd75058e10b8e0505db51fc167c688fe4c3d319de289ac77faa37913f60d2697f4456e00d637c4a3c3f83d164619e0ce1b849e8c8ea3b5e1932b56044dc
 DIST xmlschema-1.2.0.tar.gz 314580 BLAKE2B d42b221d2730d2b5cdab655269f7b885c72bce1794f12111b4110a80a1288e1996633ef5f00e9fc3ef7cd66a4267baffbdb6a906d0a0c3caf418d31abda93016 SHA512 1a6644b02e96beeea68bd737a4a66fd02693b4cb3c36a07e569a2b2c3e2b0db4fe01a475fcc3c4e5372c6000b27ef824ba5859215a03212fe4c0f2ec61f7103b
-EBUILD xmlschema-1.1.3.ebuild 709 BLAKE2B aef7d84273c8aa56270b8b2008d05e07cef508e3f7df8a22c68b736f4cb0c8e815ff0c15ccb0d6bfcbf5269e1bed2c16fdddc17fd084f38efc222e4c3ee8bc36 SHA512 8a4d6aad78d003497805b4b2953331fcc9a51d8c6669447ae4cd124dd5858c436fb4e599dc86cba16bd26e776315ffa8d7e2d87924332eb621cc75e5ac048813
-EBUILD xmlschema-1.2.0.ebuild 751 BLAKE2B af80ecaf34e423823cd954c60b54264c246259a11dc9e5e936ba8db9c52b2a6772bbf666abe9faec2ca3b8a09b2d9d818dcabccfb47e213992e47cf4ecf342a3 SHA512 b3e4eccc828cb67d959499674fec402aa264df034dabedaf075bceb06ffed2c7384a4d0c606e5b0a57b9b150c62034d6d3ddc62c46bbd72841264caa82dd878e
+DIST xmlschema-1.2.1.tar.gz 318674 BLAKE2B 686b94846b9cc8bc3dabfea9c9171a186561a0ad568a2806f5575a0c5808d3542f4e2cb7c01096036f5a54fb839cbdd95077fee9febad4cd7a82ead445228e62 SHA512 6d27ea5aea227e35f25a34a651b27084844bca015ae60d096fe1879150efb681141c368cd38cf376a2f0ea28b265cb844f1de82d2d7f704e3c2db67683f2af9b
+EBUILD xmlschema-1.1.3.ebuild 707 BLAKE2B ddbddeec52163be9ac209376dc2e375cce95ee9ee9670e2b3b094e89c005517340af27627d382a9e4ec5b7d68f1393af0808ce1c3aa964a711c5265219bfa8bc SHA512 2b13c622bfc8d8f7941e2d67232e8fc517fd68f38f931055c246ae14ac2893acd73433d24ad2956e3569225983458af77f1ced481a7d8471b934d476a76afe94
+EBUILD xmlschema-1.2.0.ebuild 756 BLAKE2B 37a7a167f92596b068de0240b6920eae9293cccf6a714c19026ed8a46e87a8c727bd6a3cc7aa8749d0113b66d854eea2e9719dcf39911f6851cb3f72349f49b0 SHA512 2d0c6fbd5d0f0ae5618f8505e37b386cf77784b5b992d6cc36cbcc7ac4df9b60db7aeca59cb10c0006ee196e8ee143197f64baba9343418ee751760af4451156
+EBUILD xmlschema-1.2.1.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
index a2b8c100da49..fc99c030c534 100644
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.2.0.ebuild b/dev-python/xmlschema/xmlschema-1.2.0.ebuild
index 12d275b2b5b1..590f138983d8 100644
--- a/dev-python/xmlschema/xmlschema-1.2.0.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.2.1.ebuild b/dev-python/xmlschema/xmlschema-1.2.1.ebuild
new file mode 100644
index 000000000000..e6e1d1a243d4
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,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 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	# https://github.com/sissaschool/xmlschema/issues/197
+	sed -i -e 's:test_schema_resource_access:_&:' \
+		tests/test_resources.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 902340da005e..7ee76df0a8fb 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,3 +1,3 @@
 DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
-EBUILD xmltodict-0.12.0-r1.ebuild 527 BLAKE2B d7f3424865729d98b01b67f6a6d6ecfb7184d9d157bb95869534776f8e1763a0d7651208fc8d764e0b7365e46c72a1ad784f11bf752f2a08342bacb8c3c8ec32 SHA512 d57c2bc064ac228ee1b6bb990eba285e51e7f66f3095447c32268a330b66f26c6ae99c720f0dcf175cf8bbc113ed6ae6351c2c05db04cbc07b8e9c0c8d49e0a5
+EBUILD xmltodict-0.12.0-r1.ebuild 475 BLAKE2B bc2a49e89a5b0ade502e8ab55d170ea9ce01b5ae4cb3bf79830a94b9afbc243e69544083099f761962155bc0fc1f1afb31e77d74cea8cb9a1669a7a3b97b08b8 SHA512 67ff5cdceb11ef532029e7a927d9a3ddc98ce3c6d97f2936dcf5796a8765335ba3cc085f42432d9a53fe8677e9969579734378465b4ab2d70a8f32a625095b46
 MISC metadata.xml 385 BLAKE2B 6df98f89bbc4f9ce1e05dc86970c81d31f70559d4b87fd4d3908ceb1183906c1195544b2e99e96931ee26985f5e02b7fb4b036d8e6cd03c389cbe5764b964111 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index 89db3373996b..35752f50aa2c 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3  )
+PYTHON_COMPAT=( python3_{6..9} pypy3  )
 
 inherit distutils-r1
 
@@ -14,6 +14,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 distutils_enable_tests nose
diff --git a/dev-python/xstatic-bootstrap-scss/Manifest b/dev-python/xstatic-bootstrap-scss/Manifest
deleted file mode 100644
index cadb17028e74..000000000000
--- a/dev-python/xstatic-bootstrap-scss/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xstatic-bootstrap-scss-3.3.7.1.tar.gz 205503 BLAKE2B 29a2047ffd37ef2cf061d84396f421656f1d29c23a5995aca5eda6f30aa67552063d01a81e5f5c0223d0c9bb2e761774b12a0e567e12b9b854a6fba330e931d9 SHA512 523f0f5c4b3d95f2751731964a046c2ec5d7b2f52fd74947f240f51539615989a26bae19b2f689b7993bd0148cddcfbd9f44c6775ad240a6d6bc9421edd74b07
-EBUILD xstatic-bootstrap-scss-3.3.7.1.ebuild 714 BLAKE2B 4410f451d653b25f53ab59bd2e03b16c2a539711f630207917fbf6143f37b01ff48fad396341c9c433d6f9041cf65fd1b8b1010fef73a961a448f09fba2e4238 SHA512 b9258c8f3c2dc00952079ea10510fc1929a936448ba368b7693de1be546b752cec12551c3eaa8a5507341d11af3d99ac1a49739982c464dbf65344f1fa746ee6
-MISC metadata.xml 343 BLAKE2B dbc8357d35e47c91214bee8dcd23c5d88e093d88a0c797bda88c25f41a6d2388e5c5cc6d9d6bb100e79dd9631029b8b4c1277d4189a9db76591499fda6ca8b4a SHA512 08754400557065ef1ab62bec132de871320cebc9d704bc4458aefec2bbbdb576e1ecddec6936175bf1d5bb66e156f29c95dbb969f5402921ec423fd863158b49
diff --git a/dev-python/xstatic-bootstrap-scss/metadata.xml b/dev-python/xstatic-bootstrap-scss/metadata.xml
deleted file mode 100644
index fa46ec35dc13..000000000000
--- a/dev-python/xstatic-bootstrap-scss/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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 Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">XStatic-Bootstrap-SCSS</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild b/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
deleted file mode 100644
index 789433bba7aa..000000000000
--- a/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="XStatic-Bootstrap-SCSS"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XStatic Bootstrap-SCSS package"
-HOMEPAGE="https://pypi.org/project/XStatic-Bootstrap-SCSS"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/xstatic[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/xstatic-datatables/Manifest b/dev-python/xstatic-datatables/Manifest
deleted file mode 100644
index e781809c302c..000000000000
--- a/dev-python/xstatic-datatables/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xstatic-datatables-1.10.15.1.tar.gz 209907 BLAKE2B 3e50c41bd5ec94386beb03de4d1fcd28cfa0594158232c2765a4f33512e1e1c822ecf1664f102f1cdf0204b81ab58eab38f6abdbb8cc196a29c16487d43029ce SHA512 33bbb9821b2acea56f2e85aca3a41433354df82455d47989c322fa572c5bb880ff7a9cbe9d9b556268159a3e9a8140a5d7215a4ecb8704db3f6d1e44860b015c
-EBUILD xstatic-datatables-1.10.15.1.ebuild 702 BLAKE2B 4048a4301acfd007c8cf721fe0f9888a3a67474c9acd8b3638917d36bb998e62574d817f1dd8dae8a2a50f4c521d825acc25c13da6eed5524388ef457414a525 SHA512 3f70bf681e9e83637d481867b281ccc3f8c6299e68bc1ca04a4d9ea5a3eb7aad25f73cbcf603e072b0d22dfee405b1b10a31e769f8bf8848a4cb7d0fc6bc1e6f
-MISC metadata.xml 339 BLAKE2B 6ca3b9bbad74fe5cafbc6dc701361f131c6140328fe031d8368277e5874a05426099e5b472a7fd45ff5614d031160fd0a626910a12cd71d3ee05630f57e107ce SHA512 ff3e268d4ff1d113b64ae85dd14791539017bd0b0c9924e10517d3faff1ac8df7f9ecea3deea122eb9a750f63beb077505d16d0a71a84a7b285a97ec3cfe66ff
diff --git a/dev-python/xstatic-datatables/metadata.xml b/dev-python/xstatic-datatables/metadata.xml
deleted file mode 100644
index 3d7edb4600ca..000000000000
--- a/dev-python/xstatic-datatables/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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 Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">XStatic-DataTables</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild b/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
deleted file mode 100644
index 6c4a8012688d..000000000000
--- a/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="XStatic-DataTables"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XStatic DataTables package"
-HOMEPAGE="https://pypi.org/project/XStatic-DataTables"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/xstatic[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/xstatic-jquery/Manifest b/dev-python/xstatic-jquery/Manifest
deleted file mode 100644
index da187f9a005f..000000000000
--- a/dev-python/xstatic-jquery/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xstatic-jquery-1.10.2.1.tar.gz 116458 BLAKE2B cc02edfbbab45bbf397923188f163df8c6567789d9c0704947804047f0067bbee9ddf0b1b96d477d25d79bc65bc4bf5891e2a88beeac1ae92279c0eecc842304 SHA512 1f77c82d0025ba0fe56934d76fb5dfc0929bd91b18e6141023246e5ed1358600cb10a9b69be806bdfac29df83e42572ab8c8aa8da40b688d02711aadff393270
-EBUILD xstatic-jquery-1.10.2.1.ebuild 690 BLAKE2B c849fa1c92f1da418d6d251c87126c7e513952c5731943cda6c84d1b940861d83ed59c4ad5c44504e455ed5cb893bb6e07c21545dd8b19978b6bd34fb8840606 SHA512 b89eb7c34f6f94eebe10de6aae1d6323ec9fb97986f356951731e8b469a02c50c28b3b25353dc24edf6f34b7dd931a88cc69db5cb27e4cd3aca3e6b2b19d3f72
-MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-jquery/metadata.xml b/dev-python/xstatic-jquery/metadata.xml
deleted file mode 100644
index 8768d46bf628..000000000000
--- a/dev-python/xstatic-jquery/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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 Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">XStatic</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild b/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
deleted file mode 100644
index 931ec2ce5463..000000000000
--- a/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="XStatic-jQuery"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XStatic jQuery package"
-HOMEPAGE="https://pypi.org/project/XStatic-jQuery"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/xstatic[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest b/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
deleted file mode 100644
index 7fb4de1493f6..000000000000
--- a/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xstatic-patternfly-bootstrap-treeview-2.1.3.2.tar.gz 19720 BLAKE2B 930f6aded2b42bb49b7b7865d64ff21923f720d15b375b018621fc1647cc0588226308e7c362d436f22074782a0e55ce7851fffbd47db1ea9c17f197e39c7e15 SHA512 51c3c60a56390b2c9662bf54a72a485ab0fa17872cd4163785c20b72fe4cc70b7a019214c1474d720e13e91eff807f0497d50bfaf5f3ce4f52a1bd488090b041
-EBUILD xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild 759 BLAKE2B 7a8a7c0960aa5fac0c3dd893f47f052baa3349c8f70e0df6e785151460ba23f14ba2c3543a1e65ed62c250aea81760494fe540cc087eac310a2d4ed5682491f0 SHA512 5b4f69a66bc8b4f7c6d5f3a6de60e77a89c16774bcb7e868805fe083682963996ae0c633b8977fcb9dc0ff5ce8681ef2efb3c7be9bed9faa59d3a8a16ce9f1ad
-MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-patternfly-bootstrap-treeview/metadata.xml b/dev-python/xstatic-patternfly-bootstrap-treeview/metadata.xml
deleted file mode 100644
index 8768d46bf628..000000000000
--- a/dev-python/xstatic-patternfly-bootstrap-treeview/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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 Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">XStatic</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild b/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
deleted file mode 100644
index 8c3f538f55e7..000000000000
--- a/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="XStatic-Patternfly-Bootstrap-Treeview"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XStatic-Patternfly-Bootstrap-Treeview package"
-HOMEPAGE="https://pypi.org/project/XStatic-Patternfly-Bootstrap-Treeview"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/xstatic[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/xstatic-patternfly/Manifest b/dev-python/xstatic-patternfly/Manifest
deleted file mode 100644
index 19ac040a6e55..000000000000
--- a/dev-python/xstatic-patternfly/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xstatic-patternfly-3.21.0.1.tar.gz 5674553 BLAKE2B 23d14689bfd43195b26f818a0a766aa7ee3f70145baf776790dc642b09a38285370065538ca38aa85ed13924feadff2c97beb1c88026fb98a5d38b502c86ff76 SHA512 14ffebfefe00107cae16d6f2a6cfa11bc7be5b4cfec54f6fe0c0adb0d22b4730870ddd382b202d3489032680d9d4a43aca8ded4b654c44b083ee36c18ca70168
-EBUILD xstatic-patternfly-3.21.0.1.ebuild 702 BLAKE2B 87409ca84679dc1aee9eb5a393e01100ca8a362801f9aac69ad94f7b503a140b3418cbc1b06f3f60e144050fabbbd570e4ac0bfa38087da9904bc3de648b7812 SHA512 eddc698ddb387f9afbcc93eae60d3c8a26811cd933ac1f4a8394be9e939510143e307fd825608a651442c092caaab8b1848fd0d7283058bb5a15e6961c251c53
-MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-patternfly/metadata.xml b/dev-python/xstatic-patternfly/metadata.xml
deleted file mode 100644
index 8768d46bf628..000000000000
--- a/dev-python/xstatic-patternfly/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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 Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">XStatic</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild b/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
deleted file mode 100644
index 5025bef7a32c..000000000000
--- a/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="XStatic-Patternfly"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XStatic Patternfly package"
-HOMEPAGE="https://pypi.org/project/XStatic-Patternfly"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/xstatic[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/xstatic/Manifest b/dev-python/xstatic/Manifest
deleted file mode 100644
index 637ea8236adf..000000000000
--- a/dev-python/xstatic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xstatic-1.0.1.tar.gz 2588 BLAKE2B 55e937e62cb845a9095d41b42b484d740557681f4b811522093c6486d97b9e5daa3d12af953bc24a37ed39df58d3adad1cb578ca434b8c0cf0ab4f4b23fff0ff SHA512 03b227a5971959c79c6b389d3bd1f6db724a439101599b8ae65b7d010712184308e30377125bbf24ce84994aa6e9add3d462fba9bee0008154d3753d3199040f
-EBUILD xstatic-1.0.1.ebuild 638 BLAKE2B d067f23ae9ac7784b16dc1152554bfad0fe99d26ca7e43107ee0f9ead4a07471bcf60bd763d9768368a7c40030ab5f67fe563c6f00d67bb23c473a6ab2cb6362 SHA512 fdd94dbb13e3797beb7876054c1ce87f656a71d1994679b69be22e708fbca2c648df1366d9f3cd7b0114604d5b258b3bac9b8dd3866a9eb0b1fe2d674f1d3e41
-MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic/metadata.xml b/dev-python/xstatic/metadata.xml
deleted file mode 100644
index 8768d46bf628..000000000000
--- a/dev-python/xstatic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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 Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">XStatic</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/xstatic/xstatic-1.0.1.ebuild b/dev-python/xstatic/xstatic-1.0.1.ebuild
deleted file mode 100644
index ebf39fd817e1..000000000000
--- a/dev-python/xstatic/xstatic-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="XStatic"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XStatic base package with minimal support code"
-HOMEPAGE="https://pypi.org/project/XStatic"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 45cb546f163a..829d4d0bb03c 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,5 +1,5 @@
 DIST yapf-0.28.0.tar.gz 157976 BLAKE2B 11dbbecd4a9cd77e6ff3f1f279cc4302b13445e3f0522f64a7e6b71155703f4c074a5bbf08cedc903533aeaee7338c63a98fc04870b8470a30377686dc66d2b4 SHA512 be9ed5278d085797aba4a582a37295716c76fd10a4cea4bb5090794dd53eba6d1340d8ba7508e33a146f189a863578c95b0a651bbfd90b0390076028e03ad9bf
 DIST yapf-0.30.0.tar.gz 168259 BLAKE2B 1c5955028531dbcc20870ef84f3ba225a203f94367edc4e7ee8245a641cd83de0e57b0d55a4c93e8ef6f7bbe8b56f26b06a257968e132a04beffd77a8f951d5f SHA512 a282213d0171671a24d44b7a00b69f65163e7a7b8edfbede5cc38c809236a71f7adc8bfc3c4a1d1e66ac3cb2d9c6bb54b1303a2875ec09cdaddaa71d2039f84b
 EBUILD yapf-0.28.0.ebuild 528 BLAKE2B ccefde6fb323f8acdda6f4114ef8767796cac43c1adc22f03a8bc57552bf8693e0c672cdb11d864ab433331365cda505877520099b13aedb96f9e1e198ee8df8 SHA512 f206142ff46ae32092fdf0eb535d3b30e7b17c7c6582338076448470319119db246a4d206285d6dc0a88784e98d64b14d857c945e9977cca8da4719b96860b56
-EBUILD yapf-0.30.0.ebuild 491 BLAKE2B b117b4bb2a31b3be7d1f24c11750382a48530211e1ae408a6dc344f3f8eb88fec47ce437a8296c748f280293b7a9379dee88d20ba551248e943dff377cd4fb82 SHA512 179dd1ad0988670b54bf7173f805035bee47761f1349c99a100dcccb90c47876bc7ef54fd27c321d38bb2a6691ff31244a06328e8f5880ae8df98749c71f9c77
+EBUILD yapf-0.30.0.ebuild 450 BLAKE2B fbaf06cc62b68b0c72a47649486e26ba1bb380cbaadc98313484af6c87ebe36c66e54b0c3859ed10abbf0f42765a0572ec6328c973a3570f7f614610f9b94ea8 SHA512 70f6e271561dfe0363041d47a1a7da99000b199b73c3e680e8a73d996c52190c7ac77b6f5ab80fdd968523cc370f3da0aef0d40655fccec44a8554b646634e78
 MISC metadata.xml 658 BLAKE2B bd04267b635e205f88ad59f2005a9699ab10970e3ba7fc8917591259e78eec9f1ce7de08d75345635277ba996fed4f7a393989000b78100695e169636d7db999 SHA512 b8c79baca3d700b265485273bcb51394e15e9688b1bb834fd29f00809188032a711f8bc05af7038589c657e9329478542ed7e6b47e420c9aa91f6605eaca20d7
diff --git a/dev-python/yapf/yapf-0.30.0.ebuild b/dev-python/yapf/yapf-0.30.0.ebuild
index 5adb3c935492..24a461376faa 100644
--- a/dev-python/yapf/yapf-0.30.0.ebuild
+++ b/dev-python/yapf/yapf-0.30.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -13,8 +13,6 @@ SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index b77882c20afd..e3163d07124e 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -2,5 +2,5 @@ AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd28
 DIST yappi-1.0.tar.gz 38939 BLAKE2B b07b38bc07ffb6ba7aea3728ba6977680ca7f2dcc499778110aa31e733c512e5704cd580d01faf3344849df6772f110472a01328447228e9c45180beefc36f3e SHA512 d743c471ee3797b9f3b24c831fcb4ddf2cec7c13c56e567c0618eeada9a534ca0b114929da623a2c67142c61f3c38b024b25ba5e32883113148f4377f7574905
 DIST yappi-1.2.5.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
 EBUILD yappi-1.0.ebuild 547 BLAKE2B 7fa3320e99330cc4ff7066bae77435359576e14a428fedc22915904fcb14c82e72a445223456c8502c46fa140b9f32f51d8869d1128c94886b543f4993913cc0 SHA512 6c12e42115de68d28c74c09901983f59196cdd3b8267dbac446ea186d995630806bb37d38115d84df6325ef6d567858798b119d5dc038e17af965829f90465af
-EBUILD yappi-1.2.5.ebuild 941 BLAKE2B 67201bddbfa460cc18d7d3866672d3096cf0a25d2451ae0e01e7c507ea1b72394a514db1a8c6f715587f938965c7a4316929c7e7fe68b86457ba75b48928e390 SHA512 45f93d3753a741ba1691115992ef8e66f79e53921a84c2b3c2af57a3c11e691d12da8a22f5bc1303a00c4d30c66a3acaf51179fba6e0e5026999439dd541e4d8
+EBUILD yappi-1.2.5.ebuild 939 BLAKE2B 08cfb28fdb2b666e030a43cea0f72b10006cf2064ab54e71e037abe6abf9e5008fe32d1d45e5dd753bebaaff494257eaedabf2797fa6dad6e2c4550b80f5858f SHA512 78104f197454e42d7587a51d8f18b0d5621a2b520bc6c32a4dbacd98ea0aa5494c1480fc26d75e572abd4c59706ee8171a83bed1707a401e1394f718bfd9d63e
 MISC metadata.xml 488 BLAKE2B 2ac7151d74622eb9e76ce39ef336aa6c729b4249e781747916936fc88e0aac76d54626b8383c58cdb6661ef080b3ee37c8bab7eb00a4befac7b0523f5552afc2 SHA512 a85e098364030d565901db988e7848181b51db19d17eef2a97ab40ab4e318ccf03e2a72201ebe28ca56965c2327ebdf9e01f5230be9a46d4d273a08cb8473af3
diff --git a/dev-python/yappi/yappi-1.2.5.ebuild b/dev-python/yappi/yappi-1.2.5.ebuild
index 73dc4bffcff5..390429d7df2d 100644
--- a/dev-python/yappi/yappi-1.2.5.ebuild
+++ b/dev-python/yappi/yappi-1.2.5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/contextvars[${PYTHON_USEDEP}]
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index 4fd0174e3938..445d4fa0421e 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,4 +1,3 @@
-AUX yapsy-1.11.223-python36-tests.patch 919 BLAKE2B 51e27515c9e4a129a11aca1e9f37859e0e74386c499fd093e304a27e72d104733a66e643de5303e6ac18df6ad16b2de840025d255f062aa360e3ff18f94dae66 SHA512 aa345024f6afde87f9e3a64da87778f1bd620cd8490d1c564cf74f3a5821eb034d94cf5b464bf567725972122ba78a981cb2d120b3e0f35541a01ecd4f97170a
 DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
 EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B 3b85f97ecb5f30d09a0eb139492247aadc6cbab2c3f7eb4669728c1a88132cddee64ee403d8acc9e24f8386a7d85c742d548d45a6b50401391756460d4af7bbf SHA512 11effd4478830ccaa5b569ed2cc4dac5c4d54199f0b781fb467c4b3e6a794cbfcc0bf048e317a7f88c7b03f19b2b87e68498d32c59d145630affbd0c450c0ce7
 MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
diff --git a/dev-python/yapsy/files/yapsy-1.11.223-python36-tests.patch b/dev-python/yapsy/files/yapsy-1.11.223-python36-tests.patch
deleted file mode 100644
index 55b6b00873ba..000000000000
--- a/dev-python/yapsy/files/yapsy-1.11.223-python36-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b79ab28e430995cd64923bb93474b214bc38529b Mon Sep 17 00:00:00 2001
-From: Thibauld Nion <thibauld@tibonihoo.net>
-Date: Sun, 29 Jan 2017 18:31:06 +0100
-Subject: [PATCH] fix error on python 3.6
-
----
- test/test_ErrorInPlugin.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_ErrorInPlugin.py b/test/test_ErrorInPlugin.py
-index 171ce5d..9f22dcf 100644
---- a/test/test_ErrorInPlugin.py
-+++ b/test/test_ErrorInPlugin.py
-@@ -50,7 +50,7 @@ def errorMock(*args,**kwargs):
- 		self.assertEqual(len(callback_infos),1)
- 		self.assertTrue(isinstance(callback_infos[0].error,tuple))
- 		self.assertEqual(loadedPlugins[0],callback_infos[0])
--		self.assertEqual(callback_infos[0].error[0],ImportError)
-+		self.assertTrue(issubclass(callback_infos[0].error[0],ImportError))
- 		# check that the getCategories works
- 		self.assertEqual(len(spm.getCategories()),1)
- 		sole_category = spm.getCategories()[0]
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index c8345edb7882..3d8dbb83727f 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -3,5 +3,5 @@ AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405
 DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
 DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 EBUILD yarl-1.3.0.ebuild 830 BLAKE2B cc31ea0ccab8787c7b0a4fc50c4c4859b70d4bbd2264ecd5fbb65d944b5be7f4a3d77416643b447d4d85da79225dace6af20d9244cedd0c913f43b06cdadab65 SHA512 81237147ffab8d8497bb5305a766d656725c9b0f2d168e6f42c5b713f8a3feb3080d61c91ff0e33da531c081fe4837900e3876e11c8490efb33a183d123b8663
-EBUILD yarl-1.4.2.ebuild 708 BLAKE2B 1408f7c495cd8c5ae63af59c16c04bfda67c701e8fce5a2da3868fcd1615387229b92f26b4d9964b06c5babd29533fd11ba35c40e3a0d1be27ada3febb8dc9e4 SHA512 56453dd571169cc3bde330d04d3544e102959ad0a4654efe90733c13fe1dcab607e10458d498187cf6a8912f6e3694fd2c03690f89a5ab62d83cad4326a723ad
+EBUILD yarl-1.4.2.ebuild 727 BLAKE2B b9256d903e30bc0de5f1c0bf193de0298308c7dc90c15dcadbdfe9292b69053e7cea9ab50ddc48fab9cbb3854008a08ac6a0e775b042aba5fb273131b2c77b80 SHA512 4a3e36be601f4deed9780d1afe451229c58cf35060152efeaec24a1ba9968845b8f2fc1fdcb262471c3fd21ddae1518f49341e28a2b47b5832c3f7330c26e00b
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index 6f51bcb5ac23..33d927f6403b 100644
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 38056e0b03d8..0c63a9d6898d 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-2.0.ebuild 1051 BLAKE2B 36718ba9c14f108434dc8158be8e517a6de34892e5b37db2800cd912529fbcceb5ab60804cd264c5d4b9126fe68075284de38e5b48b835d864af8c93465c68d4 SHA512 3a28f4d61a75047eb7d6c2f270ec5115963d63de040b75308d6b27a15ee91c6247026f059df200c20ffae0be69a32fc8c82a5312f3bd010c3418a1846d4e9a21
+EBUILD zc-lockfile-2.0.ebuild 1062 BLAKE2B 2256cead258e116969e0a4488a3fcc9e1ba8836d6eae77a5ee2704733f246fd2233de05db5337fb2f4eceb7d50d8620244847d90c561d166c69a9df9fe3155ee SHA512 26a41ed98fce65236b752aa02bebfc4e4345b99eb490b8fa25188f254fafc60b9b4be06326426e29bb4fd2eca43a2d32dac378a46ac53322ce7046252665122d
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 813fcecf7b7e..3ec50a9d0706 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /dev-python
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)