gentoo resync : 24.09.2020

28 files changed, 280 insertions, 373 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ac221eabc820..0e212658f472 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 863933ec5835..9c4e02ded827 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,14 +1,10 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
-DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.ebuild 924 BLAKE2B d160ab3d5b4b57df192aebc214061fcadd11233a7fd97480124797bc52da0f3026be74021c127b68eba8e5e3db0e9d523e20e36537fbee3fc19ae606b48a5858 SHA512 862f0822b486311c4ffec46db51030d707c43a21d69ea22b5eafbedf004679805371b2d453d0bfe9939818d2f7d9658170bb7799e601f6974f3621df03b5bc12
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
 EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
-EBUILD clang-python-11.0.0_rc1.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
-EBUILD clang-python-11.0.0_rc2.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-11.0.0_rc3.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-12.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
diff --git a/dev-python/clang-python/clang-python-11.0.0_rc1.ebuild b/dev-python/clang-python/clang-python-11.0.0_rc1.ebuild
deleted file mode 100644
index 6d7cb294e651..000000000000
--- a/dev-python/clang-python/clang-python-11.0.0_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-11.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-11.0.0_rc2.ebuild
deleted file mode 100644
index 6d7cb294e651..000000000000
--- a/dev-python/clang-python/clang-python-11.0.0_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a9b6232a2f9c..1cd2549efc63 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,7 +1,4 @@
-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
 DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
-EBUILD eventlet-0.25.1-r1.ebuild 2140 BLAKE2B 4b5d9d51b061217813cb24a6634d560f4830dd46ff5b95522e19884698f8f1917114a62cb90aa9a10e936dcdc9d9776b83c4f6157a2666a4a82874c44b3bd8fc SHA512 1760390c81442add9b8146056422897fa4458364356ca4e6e90e777b8c579936051031f9f99fdcee94ef1ed38c0ffa4729f39a3d8e8a497105030b33d09394b1
-EBUILD eventlet-0.26.1.ebuild 1768 BLAKE2B 27afbac3def3b280990f213f2a153eabf6f79d994e1cf2ed2ee984b52506d13d21063069193c88443881cced06ca2a6dc3dc93d70cf021759df12056737eeeba SHA512 7ad87350b09ecfdcbe1feecce9a01422f86a80696135810cd6758cd5108445dafb04714b4bb186d135735d2be3d6388c383310b8172913374f97654f48dc8f3b
+EBUILD eventlet-0.26.1.ebuild 1767 BLAKE2B ae71076b4ab1c6903a557fd3fb1b1f8facc88235c4f2957f41da098d1e7a1c75ccea80ca8d95cc73cc557fcc731e309a57adf8310bf24aa970dc1430107fbee5 SHA512 68b12849631f3516d4692ef4151e1bb9c00a2aac883cf4ae87aab8a7ad781ff8b102ed6748917b7502f5f6329da05eda924559aacba29d63f118f8334ccec1a3
 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
deleted file mode 100644
index 8f3f5197f916..000000000000
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-DEPEND="doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/eventlet-0.25.1-sparc.patch"
-	"${FILESDIR}/eventlet-0.25.1-tests.patch"
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# provided by virtual/python-enum34
-	sed -i '/enum-compat/d' setup.py || die
-
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.26.1.ebuild b/dev-python/eventlet/eventlet-0.26.1.ebuild
index 888bbee1f73b..e140cd0676ef 100644
--- a/dev-python/eventlet/eventlet-0.26.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.26.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/eventlet/files/eventlet-0.25.1-sparc.patch b/dev-python/eventlet/files/eventlet-0.25.1-sparc.patch
deleted file mode 100644
index c7f6a75b4f3c..000000000000
--- a/dev-python/eventlet/files/eventlet-0.25.1-sparc.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From b288e969b6a0ed24913114b7b7eaad5010db5ce1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 29 May 2020 09:04:37 +0200
-Subject: [PATCH 1/4] tests: F_SETFL does not return flags, use F_GETFL again
-
-Fix TestGreenSocket.test_skip_nonblocking() to call F_GETFL again
-to get the flags for the socket.  Previously, the code wrongly assumed
-F_SETFL will return flags while it always returns 0 (see fcntl(2)).
----
- tests/greenio_test.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/greenio_test.py b/tests/greenio_test.py
-index 39d77737b..593444d07 100644
---- a/tests/greenio_test.py
-+++ b/tests/greenio_test.py
-@@ -634,7 +634,8 @@ def test_skip_nonblocking(self):
-         sock1 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-         fd = sock1.fd.fileno()
-         flags = fcntl.fcntl(fd, fcntl.F_GETFL)
--        flags = fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~os.O_NONBLOCK)
-+        fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~os.O_NONBLOCK)
-+        flags = fcntl.fcntl(fd, fcntl.F_GETFL)
-         assert flags & os.O_NONBLOCK == 0
- 
-         sock2 = socket.socket(sock1.fd, set_nonblocking=False)
-
-From 803422302f5e813f1f00435d7ae943bf8513946c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 29 May 2020 09:07:17 +0200
-Subject: [PATCH 2/4] tests: Unset O_NONBLOCK|O_NDELAY to fix SPARC
-
-Fix TestGreenSocket.test_skip_nonblocking() to unset both O_NONBLOCK
-and O_NDELAY.  This is necessary to fix tests on SPARC where both flags
-are used simultaneously, and unsetting one is ineffective (flags remain
-the same).  This should not affect other platforms where O_NDELAY
-is an alias for O_NONBLOCK.
----
- tests/greenio_test.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/greenio_test.py b/tests/greenio_test.py
-index 593444d07..736c2e539 100644
---- a/tests/greenio_test.py
-+++ b/tests/greenio_test.py
-@@ -634,7 +634,9 @@ def test_skip_nonblocking(self):
-         sock1 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-         fd = sock1.fd.fileno()
-         flags = fcntl.fcntl(fd, fcntl.F_GETFL)
--        fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~os.O_NONBLOCK)
-+        # on SPARC, nonblocking mode sets O_NDELAY as well
-+        fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~(os.O_NONBLOCK
-+                                                 | os.O_NDELAY))
-         flags = fcntl.fcntl(fd, fcntl.F_GETFL)
-         assert flags & os.O_NONBLOCK == 0
- 
-
-From b742b443d079ec9001a1452e138773b066ed784e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 29 May 2020 09:09:07 +0200
-Subject: [PATCH 3/4] tests: Assume that nonblocking mode might set O_NDELAY to
- fix SPARC
-
-Fix test_set_nonblocking() to account for the alternative possible
-outcome that enabling non-blocking mode can set both O_NONBLOCK
-and O_NDELAY as it does on SPARC.  Note that O_NDELAY may be a superset
-of O_NONBLOCK, so we can't just filter it out of new_flags.
----
- tests/greenio_test.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/greenio_test.py b/tests/greenio_test.py
-index 736c2e539..a2d1ad856 100644
---- a/tests/greenio_test.py
-+++ b/tests/greenio_test.py
-@@ -925,7 +925,10 @@ def test_set_nonblocking():
-     assert orig_flags & os.O_NONBLOCK == 0
-     greenio.set_nonblocking(sock)
-     new_flags = fcntl.fcntl(fileno, fcntl.F_GETFL)
--    assert new_flags == (orig_flags | os.O_NONBLOCK)
-+    # on SPARC, O_NDELAY is set as well, and it might be a superset
-+    # of O_NONBLOCK
-+    assert (new_flags == (orig_flags | os.O_NONBLOCK)
-+            or new_flags == (orig_flags | os.O_NONBLOCK | os.O_NDELAY))
- 
- 
- def test_socket_del_fails_gracefully_when_not_fully_initialized():
-
-From d324431b14ea57c6d7b295bd8b00f128ed4c2f5a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 29 May 2020 09:17:21 +0200
-Subject: [PATCH 4/4] tests: Increase timeout for
- test_isolate_from_socket_default_timeout
-
-Increase the timeout used for test_isolate_from_socket_default_timeout
-from 1 second to 5 seconds.  Otherwise, the test can't succeed
-on hardware where Python runs slower.  In particular, on our SPARC box
-importing greenlet modules takes almost 2 seconds, so the test program
-does not even start properly.
-
-Fixes #614
----
- tests/tpool_test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/tpool_test.py b/tests/tpool_test.py
-index 4826f30de..1a730dc10 100644
---- a/tests/tpool_test.py
-+++ b/tests/tpool_test.py
-@@ -366,7 +366,7 @@ def test_leakage_from_tracebacks(self):
- 
- 
- def test_isolate_from_socket_default_timeout():
--    tests.run_isolated('tpool_isolate_socket_default_timeout.py', timeout=1)
-+    tests.run_isolated('tpool_isolate_socket_default_timeout.py', timeout=5)
- 
- 
- def test_exception_leak():
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index 346da0bca9d6..4ad298dd4cf3 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,3 +1,4 @@
+AUX flask-api-2.0-fix-pypy-tests.patch 1150 BLAKE2B 571b48be64f135706a010648b667032132d38fafad20fa86220766c3c4a2a4953260cdeb1933936cf0369886f171736b0a55415b73086c2f4492679f3a091b9f SHA512 df0ab5fb20ef9d79ba1c1c3aa9b33b5b7a426039dbd18743297d1c6de484ea94047edd6b4a8b6a18060b8ed494c283f1091f622c11060170a67bd4480e640453
 DIST flask-api-2.0.tar.gz 235593 BLAKE2B fadd746d91cc2c797a2e40ee6b11532eb0184a1289a692f8de844501a6656eaa1e87d10811119f267344185b22ed5c12bca43198d64d50ca8055ce95d0f62f19 SHA512 631e69e5a786598e6b5ef7e02c5c4f293eadd84d86fdf0155771d04fb6e87be5686756db90ab265cc097ae3d623c31dcebf5096a62c660d6f7d6fb1c3f3d4e3f
-EBUILD flask-api-2.0.ebuild 682 BLAKE2B a471ae91b87ec3b644dd274edb0b6fe78508dbfc7f6fd47d3aead5598abc85aefec87b1e78fc5ff082e497230689e9cdd144278493d749e7f6abda762e47eec5 SHA512 4385a2880b33bb1dd99bc36f399eb1abd4c4df4433035488d956e43e85dd8b0c85acc2cddea828d674382249ac5c136335e9eb1c2bca3268e8bb712c4869841a
-MISC metadata.xml 617 BLAKE2B 3da9d7dd713ae8f74c5ef2115935858737181082e2b86612927efcf6e47d9bce5a0d8117668155f530327180277d70ada57fc13e6a00e612440fb3321e29229a SHA512 d51812d4a625cc9f05847be119f068a574df2f9f4d51e8021b91a355faf3514c5911ebcf49c1f87f58ac64e56eb39ec4b2d0178af1680fae8c178f35d3d213a7
+EBUILD flask-api-2.0.ebuild 762 BLAKE2B 60cbfcc398b3242db93f0823cc0f6fc35b8d2bbb090f27be33eb8494d4595d1623c06f89d35a5e474d4bab496b024430e7972f323cf8ea86d75dd9f9000475cf SHA512 e333376852149a53cacc89d9a1ad293687d3aeb71c17c835d6198a03f59fa6b704be3ce88805b0b1b8d5c908294c9cf18ee12d6173c81cd5d698c73b03aceb9d
+MISC metadata.xml 670 BLAKE2B b483d7c98922bd61e034f6caf6c2fb1b93f9f0c3f1942ecd3d8f2d9382faeeb93218c8f366362fa374fe55218d13e005e2b3463b8e8660742f8557a7c743e054 SHA512 d83d0b8b3ad74f71aa74b8df9fb4d691889f037f358c0671aa18e13fbce433d56dabd9af5c998efa5ca57a9454ad292a438e7366ee5fdde12e4f78135db5445c
diff --git a/dev-python/flask-api/files/flask-api-2.0-fix-pypy-tests.patch b/dev-python/flask-api/files/flask-api-2.0-fix-pypy-tests.patch
new file mode 100644
index 000000000000..4d30691b60d3
--- /dev/null
+++ b/dev-python/flask-api/files/flask-api-2.0-fix-pypy-tests.patch
@@ -0,0 +1,22 @@
+commit beb6a364de93a429398a9491e16f60a7aa82f51d
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Tue Sep 22 00:46:38 2020 +0200
+
+    Fix tests with PyPy, remove unused Python2-related code
+
+diff --git a/flask_api/tests/test_parsers.py b/flask_api/tests/test_parsers.py
+index 90a6b83..b7968f6 100644
+--- a/flask_api/tests/test_parsers.py
++++ b/flask_api/tests/test_parsers.py
+@@ -36,9 +36,9 @@ class ParserTests(unittest.TestCase):
+         with self.assertRaises(exceptions.ParseError) as context:
+             parser.parse(stream, mediatypes.MediaType('application/json'))
+         detail = str(context.exception)
+-        expected_py2 = 'JSON parse error - Expecting property name: line 1 column 1 (char 1)'
++        expected_pypy = 'JSON parse error - Key name must be string at char: line 1 column 2 (char 1)'
+         expected_py3 = 'JSON parse error - Expecting property name enclosed in double quotes: line 1 column 2 (char 1)'
+-        self.assertIn(detail, (expected_py2, expected_py3))
++        self.assertIn(detail, (expected_pypy, expected_py3))
+ 
+     def test_invalid_multipart(self):
+         parser = parsers.MultiPartParser()
diff --git a/dev-python/flask-api/flask-api-2.0.ebuild b/dev-python/flask-api/flask-api-2.0.ebuild
index e2fe9c1ce9dc..65d2fb330244 100644
--- a/dev-python/flask-api/flask-api-2.0.ebuild
+++ b/dev-python/flask-api/flask-api-2.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Browsable web APIs for Flask"
-HOMEPAGE="https://github.com/flask-api/flask-api"
+HOMEPAGE="https://www.flaskapi.org/"
 # pypi mirror don't have docs folder
 SRC_URI="https://github.com/flask-api/flask-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -16,10 +16,13 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
 
-DEPEND="${RDEPEND}"
+# https://github.com/flask-api/flask-api/pull/117
+PATCHES=( "${FILESDIR}/${P}-fix-pypy-tests.patch" )
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flask-api/metadata.xml b/dev-python/flask-api/metadata.xml
index f29542a4355a..58477491510b 100644
--- a/dev-python/flask-api/metadata.xml
+++ b/dev-python/flask-api/metadata.xml
@@ -15,5 +15,6 @@
     </maintainer>
     <upstream>
         <remote-id type="github">flask-api/flask-api</remote-id>
+        <remote-id type="pypi">Flask-API</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 83062adeab2b..bd876f07859b 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,5 @@
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
 EBUILD importlib_metadata-1.7.0-r2.ebuild 996 BLAKE2B 2e04af2cd739c2f896b5380dd73625c88cc76150bb8ad9ed1f73a71d253132e6afb272263dcb38383965f620e97696ec57eba41e72aed3673dd140a8e2411dd4 SHA512 1d5a62e708c34147dd3a25f77565c1ab4298ed0c0915f4c056cc7199edc854e2d86aff18dff6e5028ec3f03c03e697525d7c06470d0f68e652d3bb62e1152ad1
-EBUILD importlib_metadata-2.0.0.ebuild 1004 BLAKE2B 612dd44e453439f2a85c106dff96c8327caa4a7c20a5db05fc28d1e68ba9d663bec845cad980d59c8995f371fb90f66bebe48ef5957c34f8a7d5ed49dce196af SHA512 8678c299d3401e6ff4575dd2ac601421dd113f62908618d932f5c0611c2386093036e9a5c43e55ce4ee5663e7feaa9c09e6d7a6d0884a5c7c685f140300283c9
+EBUILD importlib_metadata-2.0.0.ebuild 1058 BLAKE2B 73f648d8f8e1b1699f599fc44c4886801c0a3bbb3646652d56f0f0cf9ff2876da469c66290068407e016757ed6734d01570bb53cc4ae14b831c000e9d7db6827 SHA512 71fcd2a3239061cb0eec5a50c86c0da0600e1f5f545c83ae02deb09de9c63ab1095f5c3044921dd219d8c0c4798b034d47436c590f368c934423a91e0bf149de
 MISC metadata.xml 599 BLAKE2B ce02ca578d2030d74c64bc05e83c8453dc4bc9efe83ae89860ef66e8f13da35961dfb73ba5aec3da5f12f91be9d15a4168bf93f45c7b942071b9418cb12aeb5b SHA512 f1c15874958ff4744838e06e2dd6f20349febc7d6f1939eaed3d698ea7ab552de18956f8dc3f57777ff0c82e26be1cb6bac325a9fde1b51b796fdabb2e7ae0e5
diff --git a/dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild
index 5bc7807992ae..234d1d96c36b 100644
--- a/dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+# Included in Python >= 3.8
 PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
@@ -15,9 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
+RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
@@ -33,7 +32,7 @@ distutils_enable_sphinx "${PN}/docs" \
 distutils_enable_tests unittest
 
 python_prepare_all() {
-	# remove dep on setuptools_scm
+	# Skip a test that requires pep517 which is not in the tree
 	sed -e 's:test_find_local:_&:' \
 		-i importlib_metadata/tests/test_integration.py || die
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 3c983e0a9a90..7723efb7a724 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,14 +1,10 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
-DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.0.ebuild 863 BLAKE2B efe99feb8f7c0b6b4121591f240120a47f3f2c673d5b5d3908184a6a395b206a84abcf0f524f3106357a35b7217122875b6b4d5365af26676a48d3e1194a0158 SHA512 a3cdcf3d5af68f02e0ced1427c0babc7470b1268f7400d6c4db7d9961d5f944191777a03e3ef2c30a55ce75f003c1cdea382f2a0218e5c32c1d0c4a0b2cbf523
 EBUILD lit-10.0.1.ebuild 895 BLAKE2B 868dc79efafa28332067b6070b2e8a632400888bd6ef80a380c35359acaa781d2d31f58a216318249e5b7317b888fd10e64b90c47d3bce8dd5094cc216fbd1ed SHA512 4b5e708921eabad1d1001fd332153e3af26068d97342ad908189125adc0038a2d5af5859a2ee0b1816f0e6eb467ef253adbe53e9eee17433f19c03b21851008b
 EBUILD lit-11.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
-EBUILD lit-11.0.0_rc1.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
-EBUILD lit-11.0.0_rc2.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-11.0.0_rc3.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-12.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
diff --git a/dev-python/lit/lit-11.0.0_rc1.ebuild b/dev-python/lit/lit-11.0.0_rc1.ebuild
deleted file mode 100644
index eafbdc683987..000000000000
--- a/dev-python/lit/lit-11.0.0_rc1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-11.0.0_rc2.ebuild b/dev-python/lit/lit-11.0.0_rc2.ebuild
deleted file mode 100644
index eafbdc683987..000000000000
--- a/dev-python/lit/lit-11.0.0_rc2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 275357f74b51..78ea0b470791 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -4,9 +4,11 @@ DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a069
 DIST nbconvert-6.0.3.tar.gz 848214 BLAKE2B 4265486536cfe0cf220b8080374726cc68be4f15033c8248806579b1ea1f759caa667ae11738acce1ecc812c65b954be1c21db0abe69db7bfdf67533ea052c3c SHA512 55e6fc1f136f8bc3b4b662011172ac3f61354ee1afa6904b5df34a382ae96f46e13f097f6067ca5e42d3fd0049f81a8a27d7b7faf605fa948e22d6067bc971ef
 DIST nbconvert-6.0.4.tar.gz 841651 BLAKE2B 080f60103709bd6ddb8258750a51e7bf8891adb1eb2921619cfbb0e774a585f3d3722758d8895f67a76e2705a15a0b35ffcb7c59842ec986a13315e5b10f4eca SHA512 46c2d250e25ad0e2fee0be0fefacc198687acd7ffcb4205bb8cf0ed263e90878cf659f352d551911b0025cb150302ea9ffd67b9453ec23fc5821908f7b56dd75
 DIST nbconvert-6.0.5.tar.gz 841650 BLAKE2B 7f8bb3849374284c90bd7b17c27a313c69694e42d4fd7b5913d3b210a15f17b89ffca8436ce31fa5bfc2b586feb536522106522f3d1741ad0fb6c2995a2e562e SHA512 79164546164eada6998bd6898833dfbada0a1476af8796bea40794f6caf121d0b9560f0f50e3d477357e977222a3b75f3de85ccfa03c4aec93be75801cf6f97c
+DIST nbconvert-6.0.6.tar.gz 888348 BLAKE2B 7662437e1436a4ee9694bc05b8472b64d0773c38cc5fda3372ce9009f5d6d20e2ffb28c4baf3442cbc88414ce97870cf15a102ee609f4aae2c951d3f7ac5202f SHA512 2be6a65ed86dd10fc4fd08536db304dc359da1af66c4f907753a419b8d9caec08274c07d110a060bdae5626bb48a4f6d209e423b8eacee420d3a4c6ef0f6bbf5
 EBUILD nbconvert-5.6.1-r1.ebuild 1774 BLAKE2B cf6aa9eb1227a7d9dedf168a661d88d922695bd9ee4ff5b45a835698d578994138ec910e8e0310dd6074ca04847b439c2f66e8b81c7d68a3663de37d7b3096ac SHA512 de02167b73df31f010047b24d886cee5f9aa05d7c907c523316cbaded195d31c4a0ddab2f1b1ed21f4a5291c2b9e7198844ebaef14d800cd8e6c76c752737b0f
 EBUILD nbconvert-5.6.1.ebuild 1774 BLAKE2B e63b986fd418ce6d54ee612cc2add3ec95c29608c158c07684fdfea0d068c7920039c8a557c28027c7e038cac93a50f47ac5f2ed9b2b5134c24411c47541f00e SHA512 769089b76c9c9d8c1ef6f982198a7e3cf309aca6417f9eae1424beac9d9e97f17fd6e0c00aca7c87df75e2aed1495750a66fd584d6994b98cd2e8d15b76a9473
 EBUILD nbconvert-6.0.3.ebuild 1976 BLAKE2B e3ff10bf3b11f3a0282c17ebfb71fdc45986565398f66948e12ee99ac90b130ea5967f00354013b1bb6b6e2f3c36d75046694611e7818e7292afd576d7debff6 SHA512 b2f4a879ad9ffa2c2d461a8aeea662a9a2d19a4ba626b48e04c1c0764de0b28f828ae24a1f02b07593c2d19f3e7ae13c4bcbd4cd5cae8649735e25e7bb831230
 EBUILD nbconvert-6.0.4.ebuild 1976 BLAKE2B e3ff10bf3b11f3a0282c17ebfb71fdc45986565398f66948e12ee99ac90b130ea5967f00354013b1bb6b6e2f3c36d75046694611e7818e7292afd576d7debff6 SHA512 b2f4a879ad9ffa2c2d461a8aeea662a9a2d19a4ba626b48e04c1c0764de0b28f828ae24a1f02b07593c2d19f3e7ae13c4bcbd4cd5cae8649735e25e7bb831230
 EBUILD nbconvert-6.0.5.ebuild 2009 BLAKE2B 47d4f34b2434561d78bf51ba10d94831cdc0275b2775dca0d4096b6ceb279e529bff5662ebe5568f24830d2d271227c8e3b2b36dc58090f839a3cf2182605d18 SHA512 2aeaad26c007e875cf810a6a87e5967d4282592829084f02382013c84778efa2fd13c476908d643ed21e7bf551e9de0f3e9f9dc9336c51c202ce79c1b892e52c
+EBUILD nbconvert-6.0.6.ebuild 2009 BLAKE2B 47d4f34b2434561d78bf51ba10d94831cdc0275b2775dca0d4096b6ceb279e529bff5662ebe5568f24830d2d271227c8e3b2b36dc58090f839a3cf2182605d18 SHA512 2aeaad26c007e875cf810a6a87e5967d4282592829084f02382013c84778efa2fd13c476908d643ed21e7bf551e9de0f3e9f9dc9336c51c202ce79c1b892e52c
 MISC metadata.xml 526 BLAKE2B 8dc0ccbe9aabcdc429a5559dc79beecd4937384f3c4d84d610f04fcc347c3b5746bfba4d096ef5251003a4f81e1159663fbe338a7d5dd0dcd19b9c97c43bc1f0 SHA512 ec7ec447bab3315501d428a1f3a1bcd6e512b028982985af9862334397d4d06c837f9e40628a6b750dc4bdb9844d2ad3fd3b4b44c8f1066e5f0fbd4e8ce1cd96
diff --git a/dev-python/nbconvert/nbconvert-6.0.6.ebuild b/dev-python/nbconvert/nbconvert-6.0.6.ebuild
new file mode 100644
index 000000000000..58b0853ec91c
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.0.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+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"
+
+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/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbclient[${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
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local deselect=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		--deselect exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		--deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
+}
+
+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/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 1cde4e93d512..f51590adec89 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,9 @@
 DIST sentry-sdk-0.16.3.tar.gz 170145 BLAKE2B bf619313fb3f49800f5384f0dfec3aa34ef4bb030c5e038a485a8861a733a537ee7c834c8c200a2244335c3c61e7d564005b81d4e5c5f603d2864b2a943a5384 SHA512 e8589f7bd433d4aff068099e860c0cf012fc88dc63806873573a338bb91848d73e0a2af76dad0a5e023a1b25b0be85507346b77dec5c5a265942005219541699
 DIST sentry-sdk-0.17.6.tar.gz 183157 BLAKE2B ea0f6af54c31abc785274fc75238a02b8c9f7a978881a01203e0928e100c18df2257ec4a3cef608141b6846c616566388134a4ec31364f26d0bc2b0fadbb0dac SHA512 1af433b5c2311612ad650ea196ddfedb444e9ccb424df72422759f8647fe6cc22bb81a15933f2716cf40313ce3b2e262c077168aa831758d057a1f2e5e1499ff
 DIST sentry-sdk-0.17.7.tar.gz 184034 BLAKE2B de71b2e270594abe2e16d7e2fb9db3028e3c2abd4539269562e8786e6d937352153da21d6366d5e0384e3de1dbd6fbabe3d5060a6f0f9953bd260fbd865c893d SHA512 2360321ec0231ba76c968ff4e6dc78d42a48106aa6aade73a1c1194f9406fbafea3b533994da42027b3479302756ed3ec6e44ce551cb01ce60397939beaeb6d4
+DIST sentry-sdk-0.17.8.tar.gz 184271 BLAKE2B d34f881632e66d5db5cad0c6979de6c3c6205119af30b34996122ff7aff1ed7c3dd0c1603e57163f5d72c8525921f9af7c3e1c729adb14b43dbcee0aa4bd9fc5 SHA512 84ae0ca888457ed833b416320c45040e522a656d7c3ca0d64639f179e7be3237f53cfe4827e986a50d37bd7b61da765ed8c00ea663d478874cc47623ccf47a51
 EBUILD sentry-sdk-0.16.3.ebuild 621 BLAKE2B d2ffc79e8d2ec8daad9d01f0120760c3d1225bfebf1162cd5246bb1b7ddc5f176e6ba1b272701cb5b3a99aefe171f660cafa6be0e8594a65c0e7d2d803fb199f SHA512 32df9a79cf7988ae3687264f2ab7eca66af45447886e5e7cd33de8218373b49eb3222bb5cd30fa64648c46dbc6453176e555a27a94e1388d3d6295fe3c8060b8
 EBUILD sentry-sdk-0.17.6.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.17.7.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
+EBUILD sentry-sdk-0.17.8.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.17.8.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.17.8.ebuild
new file mode 100644
index 000000000000..1e52e8d55106
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.17.8.ebuild
@@ -0,0 +1,85 @@
+# 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 Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index de17c0c0e902..ff96fa696c2b 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,5 @@
 DIST typing_extensions-3.7.4.2.tar.gz 38427 BLAKE2B 9d7514cb27b5a8dbf246b15c8643a0e6e80d74004a39dc5585c1cb662cd77b9d8bacc25a03f9da7cde51aba4bd932ee8ffbde75d95ef29ae03c9f7e25897c816 SHA512 7a74c4a97d8cda3e56830c92b409235ffbe7cf0c1685b7fefa7a275a0abf21937622d12c25b4163b4927f6269ed689cbd30f95990ad0b7d2d4341ed648516819
 DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
 EBUILD typing-extensions-3.7.4.2.ebuild 717 BLAKE2B 21b84d24ea58e4226b93258697978ee9012d2ff3a7f1897796ee9df0b3fa342e715c987f4d7dc8d21440e0e7fa40880342374a938429c8277edb48dd87b007a3 SHA512 46ecfdfa91ad227fa1311b93a91dcd71a29aaf0cbe85caf860e0fbabad65b6411031c67a9c40826d3fd51abd02d076c4ade0535b72e0ad3c484dcdd8acad6ef0
-EBUILD typing-extensions-3.7.4.3.ebuild 723 BLAKE2B 8c05e4eac9dfb2433988aaa05f3b0d98de1a44ad3546b01f37ac9cf35ad59b19769d29e63259c49a52bf5a5f0b11082ddc7a56e25ddb34b65a7f57e42ef3a7f9 SHA512 bba3a0b8da1fa25988f962b1fc08f5f408cd65f0dc3c35d534a290c3360fd76f446ceadd3effe12ddbab80aff44b1dc28e983a714777b874cede317fa1366b50
+EBUILD typing-extensions-3.7.4.3.ebuild 720 BLAKE2B 31d49c410e3595ca2ddc11ae202dbc26f1473e87e488ebdb9a2e9e32ce22edab9fbf500a5f6a8a6d63ca64ce5e87f76edd45dfabab25f831973f41c1aa43e224 SHA512 87bfe64c32a82ab739243a775dfb04f2bcab714475b6e4a6bc6a4849e7ef165275ba55d87becb6272af5e8fe2fee2172b891dfa7346a31d003910f5cd299ab58
 MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
index 5902eba82e50..4cf3c3b8746c 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 5b4c3e170b02..4a5bd6e4f9b4 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -2,6 +2,8 @@ AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5a
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
+DIST yarl-1.6.0.tar.gz 175492 BLAKE2B e6e3ebb30a591fa1e94d07c353700b1ebf7c21a729d8c9a4cd582f591235d54dee40a109e28fb806893e281b9ab36ca2b1ca1cdf7f093587bde8a5a9c4e7bf89 SHA512 d08d2c4a906706bba3c1fad2b02e01299d076d9f6c1a1eb172d116d0ccbb1e6143b7dd959d242f2a1b5d450416bb15ab6e53ee9e05876b161d61ec23e054f29b
 EBUILD yarl-1.4.2.ebuild 719 BLAKE2B 3354c40f113ed2db98e8680ab88f3cce22b87b3bd2eb3ad5c24ccdd08d3088bc75b7cedb63908df10043f98ed10ff5811698243c754fb32e12b38d452ad5063b SHA512 dfe79f360e1162543b5bd2870a3ad6d0421cc3941202702a8a72ba1c85c17722fd05230874461e6a1409a2fab55a932fe79f0d21cc818f0722dca00dd18d2af6
-EBUILD yarl-1.5.1.ebuild 728 BLAKE2B e66676c6aa53903f43d443c4ccfdb01eeb325c9cf604c53fdda599a5d4d4d6bf7a3403b345fbab4c30540fc71357da18d1024c2718f727e4e7005100e20a6a1b SHA512 3f9b1f3b986fc680f76824397e11b85877d7c8d8db1cc0529ad28907a67e44dfc1442d413aa7a8c2fca48c38f8fd36ce6e9338fc0535396f4cb441afc85ee06a
+EBUILD yarl-1.5.1.ebuild 725 BLAKE2B 4c163efccb4020f09267ad54f5d297ca4dadeb3bbf44607ce03c6139ba96e460be4e6968d156c58b3562574bfbaa9849faaf37f0c72f337eb351b446eb9f6817 SHA512 5113e5aee9d7a3e955551b99b869357ce52886b81cc5cb68fc45035c1ba324114857cda538571665d8ec7c87682b0027df5f495cd13fecf14df35d00df029fe5
+EBUILD yarl-1.6.0.ebuild 731 BLAKE2B dc50c14dd0e15502daaf748c91b429b58bf284881c591301dbee301fc1ccd63c690ba6c70e7e9bb7f487c09b5bdf754303ebe1a9a2a52a4b59fa6d4c9a1f3981 SHA512 1c6818c83ec259d88bd9f2706c6170abdad72846e261de4f9d72edd502d243bf735965bd21c6aaddea9c5a3704ae7daa011e716774e2f10d80981b637dfc1dde
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
index 9d60e2f8c517..4eb9a41647b8 100644
--- a/dev-python/yarl/yarl-1.5.1.ebuild
+++ b/dev-python/yarl/yarl-1.5.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 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/yarl-1.6.0.ebuild b/dev-python/yarl/yarl-1.6.0.ebuild
new file mode 100644
index 000000000000..28fd8a84c1dc
--- /dev/null
+++ b/dev-python/yarl/yarl-1.6.0.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
+)
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 984377f310b9..75f5289012d1 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,5 @@
 DIST zipp-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
+DIST zipp-3.2.0.tar.gz 16238 BLAKE2B d74781639c714342863a0532ac8bbfc4d8cdcd554b9ce2b0edf83dc26ac423231ac85323379b4923308f2319c828aca2e0bcd4bd136845e7026b09e1e16e108e SHA512 fc0c8a9f1fbbcdd0f70c536e7498605e0a338dd99abd65f16b360cb16f96c7860d422ce2b55f7b2c1bfd7e5c5b5ca3bf818a48bae19bfbf190d91d4778aed31a
 EBUILD zipp-3.1.0.ebuild 994 BLAKE2B 893c10ffb899eb435f108a4cab3f575b1ac78b66bbcf039ac8527d7de17a0130593686ba2972870bc4f8329889ab2c29182e01e8c4c757668778da507f1a4333 SHA512 6a803a1a570f7fd5af147bab5190f851a7347385706346ea08153aa143e57c01131f16c6ce330317049e60a80c53380e66bcb08b32af24830945d87f2a46c646
+EBUILD zipp-3.2.0.ebuild 1219 BLAKE2B 377c34387787bae6668ddc9e4422b0eff3686fec1438c475baab68ad201991c9f8763db6a3edee05325d44de9723a414505fddfe5c89655e431b3dbb88b710b9 SHA512 e941baace24a17628066051a6ccda5befae5a90cef3c62ed4a447b0667bb4d0522aa20a69862f1a115e5309d0ada7a69ed0572a976023f84043f72df8f2cecf0
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-3.2.0.ebuild b/dev-python/zipp/zipp-3.2.0.ebuild
new file mode 100644
index 000000000000..6d3948459056
--- /dev/null
+++ b/dev-python/zipp/zipp-3.2.0.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=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+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 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
+	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Skip a potentially flaky performance test
+	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
+		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
+	# by ensuring only zipp from ${BUILD_DIR} is loaded
+	pytest --ignore zipp.py -vv || die "Tests fail with ${EPYTHON}"
+}