gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /dev-python
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
417 files changed, 4572 insertions, 2348 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e9a1529bed00..2c09d43b05b5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index 106f718ee6b8..f1286dcb077a 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -2,5 +2,5 @@ AUX SaltTesting-2018.9.21-python37.patch 1213 BLAKE2B 82257c24956fa9af21b63ca5c3
 DIST SaltTesting-2018.1.16.tar.gz 88951 BLAKE2B 41061e691f97e95ac672b463cb7dc02af4ea70553577ac80d63800198aba8de8565c021381718a32fe76fd958446c3057dec25312a1f961b7696e19570dcee93 SHA512 1ea200ebd7688de35049a45816d87fb3b24f0a862384419a3796f191efb268cdad8a69187261db91de1151f7df8147251910170fd56a50335612bf2f29f09c0a
 DIST SaltTesting-2018.9.21.tar.gz 459708 BLAKE2B c0c6d853ab335432464140b6db8939ae87b58f50c0ea63a547a09ab3e1899b52053e3f9ea90b183268b807db5d7f323f09f9b6d4186e1b4214d6984486f37139 SHA512 9ce79aaa0fd90fd75fa2a64112563751837d441518426cbdb5df93721fd186e9fe33609341a75bc173781cd9a97b477809a4c2e2d4fdd29a5331f0d096983db8
 EBUILD SaltTesting-2018.1.16.ebuild 674 BLAKE2B e4f7beadfc662c96f5cc156b96b5f3233a5c4c9b49da52dadbb0c33ca306c7f8a55f340d9f1c0cc217ffb234607449be59bc500ea253bf7f88c21440f418fdbc SHA512 bfa57ef9c1c2a1df1f4c448fd186f1aa16ba9e8c58deb39147769ebcdbbc88fb94e8df963abfb7667585aa4589be56f5139ab21600a922655a2c77de57c8e072
-EBUILD SaltTesting-2018.9.21.ebuild 816 BLAKE2B 433533a008f8365f5a21286ab03271f22597feb01cdd37cb281e40dac631bcdf74883c70082d395b9dc666409f6640258ea5d9e2c3f6e31f59d852576c15b3c4 SHA512 9f66debdd02bd716b945ba555debd0f6992d3368674cd0e1542c1f69edcf49db608de373f64c6fe8a07e6721fc78f83db776da34af1b1e64ee23b5164b9e9471
+EBUILD SaltTesting-2018.9.21.ebuild 815 BLAKE2B 45615df962de6ccd3800d5665b6010f27135a55d9f1cc4595c0fc6f1a56cb9ab7bb07ebd0f361ce0549210003238348576feabaff189f7e772a7be423c37c38a SHA512 7800a7899da9432a8fe9e37d360953b1ace4951394f7688be82b2c609824f192c4764530e0b69f9039c3e63b1e35025ddc69c0a767ed6f2b6a1ddf54dcc15ba3
 MISC metadata.xml 333 BLAKE2B e600956c630527e61c16aeba7e9146732252ed6351301052a3aa1c6187f1b496a162ae7f656cb2c1fc6be3112a7920503af30028df8b4410aa460cc1975dbb31 SHA512 ea35cbbfa8be4ef354636ca16d31caf69cbde213be302049874e03d5167a7435c28605b3dbfe8d8285784375ba2a73718eaa24bf5e9985c559cb04a6b8ffb74a
diff --git a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
index bf588d787c95..89849ebde5f9 100644
--- a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/salt-testing-${PV}"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/YURL/Manifest b/dev-python/YURL/Manifest
deleted file mode 100644
index f4b4534359ea..000000000000
--- a/dev-python/YURL/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST YURL-0.13.tar.gz 16555 BLAKE2B e48dccea5e0affa59c65682bfaeb4d4eb2504e8f712aa02f428d1767d439ac25bb4edf84515575d5e24a8b655e48ccf4974f761bd36fb4a9797b21b35bd76501 SHA512 4eb6f12b266a8905ec56131fecf6d6c44a18258c3d76df4d2d758a2053065abe3695d7ed627da274e7a5aa30e9e1af49beee1a537b8f22aa8022ca926c78ab0b
-EBUILD YURL-0.13.ebuild 467 BLAKE2B a30906994970a547cc0c3d961ceabc53a14253a5e55247677b119f8004027a2dbb41f2ad4f180569c4e71ee1ea08e4a6df99a5f94a4dd0922f3e241f5b7f564e SHA512 c4a2af6e1d20e82ea0ae91a8aca678714f1bc4c85f13fa221d3c6309176388fccd0b24ddb517eda308a5a7ff0d0bf08344165f00d9e4ba6a94aecde6559c3c10
-MISC metadata.xml 239 BLAKE2B e344b32f5289e9825f8017aa219391618f6b7917833467c804ab10283959b127fb41dd4bc5eabb7c9f38ef866958793604fd935cf4bda3ae229c7f5e8b910862 SHA512 0c8a2241af97764e511ed2b95e1d09781ad0b7ff507f27b8bff8e9a33cecd8de6ceee4ed8b3e0e3327da945011c42ad2c32f2c5a15db13b2a4879009776e638a
diff --git a/dev-python/YURL/YURL-0.13.ebuild b/dev-python/YURL/YURL-0.13.ebuild
deleted file mode 100644
index 102bffc98df2..000000000000
--- a/dev-python/YURL/YURL-0.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Yurl is the replacement of built in python urlparse module"
-HOMEPAGE="https://pypi.org/project/YURL/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/YURL/metadata.xml b/dev-python/YURL/metadata.xml
deleted file mode 100644
index e2e382769b7e..000000000000
--- a/dev-python/YURL/metadata.xml
+++ /dev/null
@@ -1,8 +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">YURL</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/addons/Manifest b/dev-python/addons/Manifest
deleted file mode 100644
index 9df9812db939..000000000000
--- a/dev-python/addons/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST addons-0.7.zip 34220 BLAKE2B 06646cfc5e5aa46226a2e341c2cadc0589fd6b4c39e7dc8adfd015d8ce36e17b7ea1d5da7c8460649c36aee0f9afd73d6813a3545468da7d6038c3de97e7df14 SHA512 4847508aebfac56586878e987eafc852bf41abb5734efbd4c0f12480a871e9820449f0c56a2da82060234a36b3b5b359d908283e6d830df56b759dd39661adb4
-EBUILD addons-0.7.ebuild 667 BLAKE2B 9220ab629f9eee87b936565c1962b53e09c7a628ae1027986139f21c42a38faeaf0dfc8fdcd62c7e447d0935b3df511e97c9a6c748f1a192e4dc29c88e538d2b SHA512 4554563a981e573aa2d23c4c02644d759d25ffa7c535f01d261a45deeae2c0bc3b08f0f8244ede24ec8d97e88bd2a975e65a3ef34790b110c03edc6d8f9bd874
-MISC metadata.xml 319 BLAKE2B 27f0e91814ad19f8d05f809bb781998946df3dab424171e080a2ac7dad06c4cac87e4710739978af2b2f451d964751f910ab45fbeb08ff545be97ca99b10e998 SHA512 bce746eb0779e7aa417d2ec6787005851afd8446308cf5ce6c9f19624d3771b778cc6be1fed45f47054b2bb5b13438517f360de236a200bded8da95cd5ff7db9
diff --git a/dev-python/addons/addons-0.7.ebuild b/dev-python/addons/addons-0.7.ebuild
deleted file mode 100644
index 4009d010a1d3..000000000000
--- a/dev-python/addons/addons-0.7.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=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="AddOns"
-
-DESCRIPTION="Dynamically extend other objects (formerly ObjectRoles)"
-HOMEPAGE="https://pypi.org/project/AddOns/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="ZPL"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_test() {
-	"${PYTHON}" peak/util/addons.py && einfo "Tests passed under ${EPYTHON}" \
-		|| die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/addons/metadata.xml b/dev-python/addons/metadata.xml
deleted file mode 100644
index 05ef109d0ecb..000000000000
--- a/dev-python/addons/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">AddOns</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/aiocontextvars/Manifest b/dev-python/aiocontextvars/Manifest
index cc93f87430ef..662006d721f5 100644
--- a/dev-python/aiocontextvars/Manifest
+++ b/dev-python/aiocontextvars/Manifest
@@ -1,3 +1,3 @@
 DIST aiocontextvars-0.2.2.tar.gz 17329 BLAKE2B 96c77d6222456b84a99454d60aa5f30d8256297f716d729398a07a3d9bcfa4a64fa44d183163c47deccda75d5e761140aecb6d5f5df2865e1c52f9cd6682cce8 SHA512 87de2be27217b664615ebfec2b4bd4da8542913649ce2b4f23357e7d8b07c9776d633f7f781caedc6eb4e261bdd762228486ab69d6b776e40013942e593f19bf
-EBUILD aiocontextvars-0.2.2.ebuild 709 BLAKE2B 745d439cea4ecbcf6f8b24747c93bf2c32920cfab7a76584bc14c6f09370d7fff1fe7be87453373fb46b070166046a8b09cc5808e5b0ba6d97a08dab0e10a354 SHA512 f0a9f0dc78687c70bf054c8fd154fc0408ddc25be0786e8049722c03880abc2e3953cfa1179af61130eeaa4b68846ce5b49fff4f1ed1f8ebe82b5baa767bbf62
+EBUILD aiocontextvars-0.2.2.ebuild 708 BLAKE2B 91e447ab7dd17d7b97b4e9af7ca5e9e5a89d840c9af8b9379e40219960f5e6a7f5f44a254c7507a245ddbecddd6b5530d4b978de3d64961a3aa8d65e555741c3 SHA512 3e6443d4c5b39a8e4fea6dc4feb1c827dbe66d87912d7f85b1f9fb3c41ba68eb90af3c7a5377ea0e34236dadb371c0fab3b3a806cd446dc2e54b0a12c57995cd
 MISC metadata.xml 356 BLAKE2B b803eba6f4ba59df603e711eea6fe7b169a304ec1e1df8e9133575f8540d2ef002b3fb8ecf186d9ab522b00a7fc6ffaf188bb8930d07d66f10b01ed86614534e SHA512 7aedb0c4fe2e58f969a1cc457d4eb43354a7cac4c82add69b8d2aa384fae6888a8f4b82601a8db1ead5466f8924a3350a4794c3a408a6b4ecf4dff1eca819015
diff --git a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
index 61983dee54d1..fa25b811305c 100644
--- a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
+++ b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Asyncio support for PEP-567 contextvars backport"
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 04202bc7dcc5..9f82bb74aeb6 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 902 BLAKE2B c1ecabc8fa7fbca9cf59cb06bf913a314571e3c8eb94cac97f71bba31e98eb8c81b5d9f7873b66ff296d3966969b4628a89fad4d0278e1d378c21821fadb32dc SHA512 af4701ce5d4dd8d5898bc9cf4f72205633ffca1ea7ae33cd49e8186b7b63e419ac7bb872223b8f31f41d505d1c0e339680e1beb3c011c139c0f37d15b7b183b9
+EBUILD argcomplete-1.11.1-r1.ebuild 901 BLAKE2B b849d4dd62faa60f580c1253982fff13318942ec3ac7c0b2be8ce7f779aeeb65b03cdcac4ba7425d0f91fed7e93609bdb0f210b2ebfb418daeb870ca9f304652 SHA512 1875bbcdb461030746970962ba27defdef005db61125dd87fbc5c1d7280567b7ef2e0de486f410d59b3d74c639a5da0db1320a20e87c081c389737bb51df11b0
 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 fce733275ff1..ba290069e48d 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 ~hppa ~ia64 ~ppc ~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/arrow/Manifest b/dev-python/arrow/Manifest
index d31310f1fa51..4c606867ac17 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -2,7 +2,9 @@ AUX arrow-0.15.5-remove-dateparser.patch 1250 BLAKE2B b9fc76fd97b74f11bb8a9511ff
 DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
 DIST arrow-0.15.5.tar.gz 82264 BLAKE2B 2091e16921a5f9f944de3f25ce853b50973d970d982b880fafa75ee37f98110dde05bfd02bb8ce27518ed17600e5bcfb8602c353d7e3af249aa4bfc4b642356d SHA512 cb147a1f2976e6cedddbf2d2d0d5ce69a4a609d4c0c3d68f96b317fc2af334552cb0c1a94aa5bb38e6d74ca7e1beab1ae8a325920a15efd79c35835c92df2409
 DIST arrow-0.15.6.tar.gz 83160 BLAKE2B 1a79e91a3185b8866653646f1a553d141b0c20b4712ab809add0362c76f7f9086a259db9827423074387017c439664e5c8bd663b719eadf725a4de608f370cc2 SHA512 c56316f8c535c6f14ccaab32e2559b45309170fd47e8728cdd8c0e2af9398264f90fbdd0ece82d14e3f959d24b186fac3e8bb52cf7a64fe0dcd4c247650c73b5
+DIST arrow-0.15.7.tar.gz 89278 BLAKE2B 591fbd63aaeb644ab21f0499df7929cdafe181ad9065459677c84347395dcc694e39db47d596b4d3f920e32e3f1e03da1d9e85c8f197d545dd335e9055a65f47 SHA512 28cfc9edbf013ee03bb52c9794333d725a4fc967f0c8c6837931fc6994e08c367763deb193b8eae8b931cf849294bfce3470316c0a1b73340eb96ca1c9d8959c
 EBUILD arrow-0.13.1.ebuild 732 BLAKE2B f41fddc75737387efa31433f3d923a028a74a938b8e5ec5414b9d298df8f6326a31c4af9d3ea313bc6c885e23862fc929b4b3f290b2771210e495075eea3c87b SHA512 79bd09eee7f07b0893b444200cda484a63e4b65053a07b76f9de117d32ef8937ec24614f10d1c115fc4f74d2a6dad768072c9fbdbd641f4a997f7c071a629f39
 EBUILD arrow-0.15.5.ebuild 706 BLAKE2B 04fe820f518415378b6af72e9b9514de3a00a1bc25f1c8f86ddb6afd98aed03fd8c6edc9ad8947ba9813cc0a18c3fc75ffe5e46c7449a24c93ecc37f100e88c3 SHA512 70e515edac5aed1d9b5a15c3c79a1ba831401daaa6e12d0624bd3ca82833ae805a475d5ea07e8b5c177ddd4fd07e330b3fded39a7776c4d76d192a5df5ce5f8f
 EBUILD arrow-0.15.6.ebuild 698 BLAKE2B 4130f9faf46dcd064fc56f506a49bfe4392e4f76dce6fe01352461d703f4b402973edcd4eeb0a7c0449da24b46e6bef8ed0f994dadd099cde3d649a2c3b8bc62 SHA512 ba31024b9c81bf0e2cba8400f840668c492e37ed3e9c0bbeefb35842144f2dae176fcccf67f80642720ed12b4fb342c957f306fad7ff0b324c0207b2548e0c8b
+EBUILD arrow-0.15.7.ebuild 695 BLAKE2B 3f2eba848502d058d2858188e71a227d7f82a512865c3e63a08f5efa3049a002bbd87b93c01880ab4f4253c77131be8368f3a272c6b3cfb399deb3c612212804 SHA512 44d62ab72071526f7fe6a95e0201f5b2d34fbfea7b23ae508417ea7cf32c535810d3910c9ef72638e670bffe834a76d59d4f985a340963baaa724a078583b1b8
 MISC metadata.xml 364 BLAKE2B c9cf1b8e27d0ae03d522628edffd052df05f37a857d671df00ec0f2868c598ba983b32b66a98c0f4ff814f8fb5fcad8482592852c38384c7eb99bb71f0ac8b32 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015
diff --git a/dev-python/arrow/arrow-0.15.7.ebuild b/dev-python/arrow/arrow-0.15.7.ebuild
new file mode 100644
index 000000000000..be803b27abc6
--- /dev/null
+++ b/dev-python/arrow/arrow-0.15.7.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/crsmithdev/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 26bc5d2abfcc..68ed3a76f623 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1,9 @@
+DIST asgiref-3.2.10.tar.gz 25669 BLAKE2B 2cd0328054b218ae8abf840f85c7da6d9183dd5a52cef78176756020eb1f565fded9717fced3bc7fc4b85f9f1ff34b46ea95231b74afec0cbcc5000f9468c28b SHA512 8688d71103dfe569978712481161a88cce9aa6587eacbf29ea42d585817c813625360724d1d561d12456a6580647f9d4a098f194bd780f3c9f7e52a1e0aa8c88
 DIST asgiref-3.2.7.tar.gz 25350 BLAKE2B a92d573330b1d10ba9c8d963c0824bce93151f0e38533f81a292ec0b98bc218e3b214e44ed1dadcaf10b94e94fd626cea00a5da40c5dc129b7f40ca2c5afa432 SHA512 a7b8b94e14299ced539c7ca60d310bbbde2af0f40bfa404d176a95bb6cd37402bf6bef5a5a309cdcdda4852908717a83763d7deb520b05ce74977a3bca4621e9
+DIST asgiref-3.2.8.tar.gz 25469 BLAKE2B c6c3510159aa3a5a35f5d16b427d074b72973576cc4747076caf43854567c628eb37703bb5916cfda9d9dac45c700f881957cbc6a991ab13731c54ef2f6aca53 SHA512 895a0ff28a7d11facc0a41ae603099afb49c2e01ff2d912655d27fff2e2aa0ee8d84fcba45fe873260b39de0e3dd225ca5218100d4bb96c83e63d1fe36f4683a
+DIST asgiref-3.2.9.tar.gz 25482 BLAKE2B 0bb99c8b207bd384e7c691696fd64dcd08d02037da98c76d6e401d6d37db432443a10d08a3908fd17908d991455d1ac2faae82726062271a3dd17e4a68e7a2e4 SHA512 1810b19bb045fdb4bf47ec7e5caabd0f8869410a6f81503de2148fd024a88da40ed93cce1b47905d7e99f7e89f08a61a9980b88ab738e783664520c6f27e346c
+EBUILD asgiref-3.2.10.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
 EBUILD asgiref-3.2.7.ebuild 551 BLAKE2B 940603a6fca7eb90892cc81c038d128f9959060fc073647bb7edd94fd64d58751ba3c71e714da2fa1a6f7f17e27f0c4a4689f40af5963d7608baa24587d2e266 SHA512 c1c490b01a23328484e6a416aa5314f48bba151b52064e79e16ef1efc902d6b6e18df7a687c0319c6bc61042c77c8219e7d3bf7abeea308f5496d20c32988033
+EBUILD asgiref-3.2.8.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
+EBUILD asgiref-3.2.9.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/asgiref/asgiref-3.2.10.ebuild b/dev-python/asgiref/asgiref-3.2.10.ebuild
new file mode 100644
index 000000000000..105d875af283
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.2.10.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.2.8.ebuild b/dev-python/asgiref/asgiref-3.2.8.ebuild
new file mode 100644
index 000000000000..105d875af283
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.2.8.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.2.9.ebuild b/dev-python/asgiref/asgiref-3.2.9.ebuild
new file mode 100644
index 000000000000..105d875af283
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.2.9.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/assets/Manifest b/dev-python/assets/Manifest
deleted file mode 100644
index 67de11788d15..000000000000
--- a/dev-python/assets/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST assets-0.1.1.tar.gz 29938 BLAKE2B aeda3b0a3846227c8c0eedbec492511befe56c1ba062852998ad1524f0dc75a24f03af0855ec1b64f29e00ea060652520e6f767496fb8cf0cba53e605c707551 SHA512 373dfababd91bf28929dbc5562027c2bad14dac84d822c65e899137f5f5f9dfe3041b16dac08bc811be9b3fb2f553869643fc200ae9198eb046cd02b420714c8
-EBUILD assets-0.1.1-r1.ebuild 658 BLAKE2B 761f5e878d875833c81463eb5be7db7430b5d135d6e8fe70bb24b03eed84dae60a89b4a9e14544cf21c1588db8b273af94fc8c7c42d844d100cb7f99b8bbdf11 SHA512 f0f99e14943a7a9d5ad761e8a495e74a4e49fff04f2e5c4e6aa272dab2eb067df893ae6628793cc1206b185ec6290f42e7d5eeff135f5473ba1c3970d0ef1675
-MISC metadata.xml 806 BLAKE2B 68edb2280de952e4aa87c93c5d8402352211a7cc7636b7aa0622008c7563c330e05ec78d64439eebe37115b00c48cd3ae374dda7a062958773530817528acc94 SHA512 4cbfc3aa5ef56026ed27e1482dafd3bbb68c1aafc821a707dce7fb266cae57153963b2532a13b3c614a1f898e4401a5f5699ec45e79a63db564260676aae6826
diff --git a/dev-python/assets/assets-0.1.1-r1.ebuild b/dev-python/assets/assets-0.1.1-r1.ebuild
deleted file mode 100644
index 0ec2685a1167..000000000000
--- a/dev-python/assets/assets-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cache-friendly asset management via content-hash-naming"
-HOMEPAGE="https://launchpad.net/web-assets"
-SRC_URI="https://launchpad.net/web-assets/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# The package tests assert on '/tmp', bug #450540
-	local -x TMPDIR=/tmp
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/assets/metadata.xml b/dev-python/assets/metadata.xml
deleted file mode 100644
index 919f6b2529a4..000000000000
--- a/dev-python/assets/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-	The assets package does content-hash-naming (aka URL fingerprinting) so
-	you can use aggressive caching headers without risking that a client might
-	have an out-of-date version of an asset in its cache. If the content
-	changes, the content-hash-name also changes, resulting in a different URL
-	for each bytewise-unique version of an asset
-</longdescription>
-	<upstream>
-		<remote-id type="launchpad">web-assets</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 5289e1c42b14..4e1e6d181aed 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,4 +1,7 @@
 AUX astroid-2.3.3-no-pytest-runner.patch 405 BLAKE2B dc496ac27938fa316f59f3058a8f2f17ca397225ae09a1adde80c8da50cd68572052a733ff08d5fcc602d3c38722a16f3f8395608955d9b56c8f1c122541c4fb SHA512 be925b49c4ef04f9b554e446410904dca1529a8aa61a8fe9ca869e1c1a177ca86e7632c62c0f1025caa69e58ce23ff7f342198ba9fb85ec1bde164fb63e285d0
+AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
 DIST astroid-2.3.3.tar.gz 297350 BLAKE2B 7ac5cf028fa0263998271d23128b1bfd127fedafab2f6b3cc465867b9668942e1edc79bed62eb34bcce31b6892e4c5a31dbdd68d20fb92a1f134dc9e78a76920 SHA512 72011f3eb312ea7ce7dd55f7615972f6bfc152d8f16f9052b405f44fe17e594d5da22e0502b4c3034881b9783be9e808509d4ded3d679182ddf6d34eb90748f1
+DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
 EBUILD astroid-2.3.3-r2.ebuild 1419 BLAKE2B 58a8ff2ac83e43c980dbd1cccfc2addf994817267c94fbb12dc33cc8fce57f49e42af5ea934c4e2c92273b82ce181a37b602a3047da2392a586c8c5ccc509c17 SHA512 0f28599a319172926d3c522bc75fdad347a4e77e943d898dd797e9f08844b1e1beff1395c8eb2231338df3a1fe6a90dc81500513c52340cade63dfd376f717ec
+EBUILD astroid-2.4.2.ebuild 1359 BLAKE2B 851eca202c7deaaca203ffc977104ba7d27c2a409dcabae463679534293d8d8bb229c308cdaafadb1de5979d8398e1e289e27317e480f0c2c7bec77fe4fa8f6a SHA512 38b6f3b8ceb719ef3ae0e12e770fba60d8fcd593fe038ee2101270f0452a175e9c07341d45f23258eb66881e783b58b43d9e815dbbe8bbe812be20adfe5b886d
 MISC metadata.xml 1147 BLAKE2B 6fd688ecaf19f5de658caecd0e4a5b5b451ece67b0e55afc8fc65cae8f99f0a2cb09c5e70b2cf3b68a4748ee10a417dfcd93569cc35e866aec7404d6ec9ecac4 SHA512 5eab195b147e8e1551871f537d61d0a4460ff8be0420c7e1661f6774f7fe8ace43f665f64d61677bdf890788d8a53206ac54350a8c6b73f87ba9a6edd44d56da
diff --git a/dev-python/astroid/astroid-2.4.2.ebuild b/dev-python/astroid/astroid-2.4.2.ebuild
new file mode 100644
index 000000000000..4b6254b039d1
--- /dev/null
+++ b/dev-python/astroid/astroid-2.4.2.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,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.2-no-pytest-runner.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Disable failing tests
+
+	sed -r -e 's:"(wrapt|six|lazy_object_proxy)(~|=)=.+":"\1":' \
+		-i astroid/__pkginfo__.py || die
+
+	# no idea why this test fails
+	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
+		tests/unittest_modutils.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch
new file mode 100644
index 000000000000..cae04e05a33c
--- /dev/null
+++ b/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch
@@ -0,0 +1,21 @@
+diff --git a/setup.py b/setup.py
+index 016fce18..a6825d8b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,8 +30,6 @@ with open(os.path.join(astroid_dir, "README.rst")) as fobj:
+ 
+ 
+ needs_pytest = set(["pytest", "test", "ptr"]).intersection(sys.argv)
+-pytest_runner = ["pytest-runner"] if needs_pytest else []
+-
+ 
+ def install():
+     return setup(
+@@ -48,7 +46,6 @@ def install():
+         install_requires=install_requires,
+         extras_require=extras_require,
+         packages=find_packages(exclude=["tests"]) + ["astroid.brain"],
+-        setup_requires=pytest_runner,
+         test_suite="test",
+         tests_require=["pytest"],
+     )
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 36129ea8a7f7..ce1cea253ff9 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,3 +1,3 @@
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
-EBUILD attrs-19.3.0.ebuild 861 BLAKE2B 724138a78d44bb3611f68d4e9b04c51436c56852d16cdbc6f280e039e2c4697f88d4a7886bed70ff681c2332e4bb15035a04f8a39d56bd9d17916c41f67321b0 SHA512 b75885531638d3a18cccd60764806d92f956f0c37c631c6a6974171fce6c68551453bfa2d6838746cf05496c13c93de9437db3cabe6983450844ee02991c60f5
-MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
+EBUILD attrs-19.3.0.ebuild 868 BLAKE2B eabe886f699ddfdc462847003e10d102ad3ed75bf901af6e12158197490bed29983b89a65d1fd584bd10edcc620591b0cb207f4eea877e0d247e4533182c7a19 SHA512 ab4542831afe2178c61e6056cd444ba77ea5a4e26c5ec388ecf2aca644b4771b3a46080d8c1c5bd7a20b25bd136a9f2be1a7bbd3bceaea857df7e77cedb07942
+MISC metadata.xml 495 BLAKE2B e9a4bb16661c2b059e33b2f4182da181bca463091c53e4f1ff61c54137030bc9982b746ad9544dc0c293be4d05cc14949b1e2fcda773846de04ed879eef59d97 SHA512 439bf5cd48fd1647fb72a6bb320b493adbfef6be38298d1f6aa77c3d4594dbc03082701390a69f9324dd76fd3367472d865a39c7b5ba48e2a5a0ec56e04c5d39
diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild
index c70e9dc60661..9efce0cacf89 100644
--- a/dev-python/attrs/attrs-19.3.0.ebuild
+++ b/dev-python/attrs/attrs-19.3.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Attributes without boilerplate"
 HOMEPAGE="
-	https://github.com/hynek/attrs
+	https://github.com/python-attrs/attrs
 	https://attrs.readthedocs.org/
 	https://pypi.org/project/attrs/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/attrs/metadata.xml b/dev-python/attrs/metadata.xml
index 773a1e1640a2..d62e6b96291c 100644
--- a/dev-python/attrs/metadata.xml
+++ b/dev-python/attrs/metadata.xml
@@ -11,6 +11,6 @@
       <email>hs@ox.cx</email>
       <name>Hynek Schlawack</name>
     </maintainer>
-    <remote-id type="github">hynek/attrs</remote-id>
+    <remote-id type="github">python-attrs/attrs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 61ec749731bb..dca6e5e9909d 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,9 @@
 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
+DIST aws-sam-translator-1.25.0.tar.gz 5144283 BLAKE2B f04f2715f140b2ea0df71bb830e033442d212db88ae1f08a8027d0875e6c4d2a3404f2855d54109b1623e3c290aa7ee8f2d7d205ce2163ebdfbddcbb46215fc8 SHA512 4dd428750c7e0c73987dea89b8a257fad33a59680c282136f6adaff16e3695123d0d3d42b45cd85da5311e1b38f2a2879d54170db7d5303e6e8d9086becf66b1
 EBUILD aws-sam-translator-1.11.0.ebuild 824 BLAKE2B 65c797b5020337329d624225cdd4083a0b883c20523dce972f6aff6501c7398b8784de815be9430058269b8ef907d4c366fe207f922c563cecd15a7c1f6ad3aa SHA512 ba3b300c41aade2dc975e3b0a55d8f28cda4f33836f18f26733df6898b7cb84bbd8260d4e8b06374325da1fa082ac16a2a7e33998fd512affee21fe22a2f00e5
 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
+EBUILD aws-sam-translator-1.25.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.25.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.25.0.ebuild
new file mode 100644
index 000000000000..e570b035756d
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.25.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-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 3b0c8a8879e0..2d1886568330 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,5 +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
+EBUILD aws-xray-sdk-python-2.6.0.ebuild 1462 BLAKE2B 9575e7447cb8c37c0b497a70156c1477d8d0ff5c28ee748e4f6f080421298850ba327251f37e6a020feb85478f692d7624777e5bab87b4b10b91be9c7758cb3a SHA512 fc2d7ddc25d80cf796bc9283007c3b908c177a665dc887480c9d3dcc7570b37b5c084c5e1a902a8983cc8293bd8e067b518c882b1d329c3ec4cfab0deec33414
 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
index 21cbd82511a9..6d59ba398b05 100644
--- 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
@@ -26,6 +26,7 @@ BDEPEND="
 		dev-python/bottle[${PYTHON_USEDEP}]
 		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
 		dev-python/webtest[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 9071b42a8b6b..1e559e3538d4 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 1197 BLAKE2B 62b08c43b3017cd170547ac5fa5f73c21dd5581bc992ff7755b9277352d9156d3df767aa1e87a2db54ed914cae4d224c2cbe065f31aaa714170c005d78eb2ec6 SHA512 0f5acc190d2679f6823a54c1b5f5c03032412de83987ce8e40613a4df4e806f128bb2153a776a81a71fbd341cbc68f8ee867f1e13cfaac288be2a2d7d56bed6c
+EBUILD betamax-0.8.1.ebuild 1194 BLAKE2B 8a7b8e17ee2f07825c284ad8c4bde8c1c8f9202b037fa8af804c08607d53c882d3d7675017e1c1499be146b48219795be1e87ce7e46a37654d9c14a9ec2b838b SHA512 a2957b912eca66702d88c44183384186ae03648045d8c554940f4dad8faacf6022ef5d76f739a557a364249083269906594451c16ad12914d0e25b0067299c62
 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 bf2c16108500..93bbed43e931 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="python-requests HTTP exchanges recorder"
-HOMEPAGE="https://github.com/sigmavirus24/betamax"
+HOMEPAGE="https://github.com/betamaxpy/betamax"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
deleted file mode 100644
index b7d94f6de152..000000000000
--- a/dev-python/bokeh/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bokeh-0.12.6.tar.gz 13720124 BLAKE2B e8fc1c42b530622bf6de8e13e81ae45e6d47985cef1ed81a2e32bfaef2a246a09c25210728cf434da6d4a0ef8f47ade1be5ee9e9318cc0a071bff36b317069a1 SHA512 7a293169521b690bb2cdcefe3667f869e75f2b718d6122af63201e2fb2e530eba931b3fa2ee3474a8ead758039cbb7d756acc0349e2f0820d72a4f754b9301b2
-EBUILD bokeh-0.12.6.ebuild 2102 BLAKE2B 524d403a63ad307c7255b78caa0ca109ba99d1d51fb6c1e97480fb4e1b51821477004e11506c0e222964062ef6bff8165859e9eaa5649acae750c9f241ebf416 SHA512 96ec0e73a6084832b6635e971c2e74e86d25fbb972a25367dc54ac3ce576a872a3b45b7cbb79cf6ccd3264d2344f29c123f5800565a4ec985cf0fe8bda8f9544
-MISC metadata.xml 879 BLAKE2B edcba4dfedb81192edd9a32b2ad320582129f0efdd9ccab46d99ebc0e561784f04f53fe1dd80243513ea0a69ab3dfeb1d36cda6a5b37585cc26e2c203194a8bc SHA512 46419cc11f266c9e5d51b35c4bd4a75c4c82446dc8a9f06b6ac7ef3c742a371334b56e98a4bc831bc4f5ccee0222ba7f2b36a44d32fc4ea3aaa092b32c7429c9
diff --git a/dev-python/bokeh/bokeh-0.12.6.ebuild b/dev-python/bokeh/bokeh-0.12.6.ebuild
deleted file mode 100644
index 443dae5fd0f7..000000000000
--- a/dev-python/bokeh/bokeh-0.12.6.ebuild
+++ /dev/null
@@ -1,76 +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="Statistical and interactive HTML plots for Python"
-HOMEPAGE="https://bokeh.pydata.org/en/latest/
-	https://github.com/bokeh/bokeh
-	https://pypi.org/project/bokeh/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=net-libs/nodejs-4.1
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/boto[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/flexx[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile() {
-	esetup.py build --build-js
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	py.test -m 'not (js or examples or integration)' -vv || die
-}
-
-python_install_all() {
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/"
-		doins examples/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bokeh/metadata.xml b/dev-python/bokeh/metadata.xml
deleted file mode 100644
index da849fdc2a30..000000000000
--- a/dev-python/bokeh/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@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Bokeh is a Python interactive visualization library for large
-  datasets that natively uses the latest web technologies. Its goal is
-  to provide elegant, concise construction of novel graphics in the
-  style of Protovis/D3, while delivering high-performance
-  interactivity over large data to thin clients.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">bokeh</remote-id>
-    <remote-id type="github">ContinuumIO/bokeh</remote-id>
-    <maintainer status="unknown">
-      <email>info@continuum.io</email>
-      <name>Continuum Analytics</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e88b5d399652..58ba37f1a44e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,11 +2,15 @@ DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b
 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.14.2.tar.gz 297730 BLAKE2B 174bc2435247db4421ffbf1ca0ef2cb772a9b6f357cbb438996ad635fca8ae5cd1005df3f8fdc6c63607797115c2379bb10c43edcfaf8393394f241b1e7a1ca1 SHA512 6ad539e568fe90c2f7408f37d28f194ac7094f6393858e487bf2afa73b8b53c90c8ab489bbe56f7c594351b24aaa82bfc9f81c9d68fadaecaec5acc3352fad5e
+DIST boto3-1.14.5.tar.gz 297919 BLAKE2B 9428ddfa1a5549bfb8319cc91292dace9245a9db94eec373f571342808cdda7c1bf2b683ccddbcae532aca79666971b5cff7646756dff7baa24e291b348ff0f0 SHA512 7c65b1a1b6070b8954b7a705b1473543be6a4939c8594327cdaf8c91ff557bfdb49611e18f2bc6b0213fc13ef4cdbf57da7e632ac93dacf6d887f7a18889ff59
 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 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.14.2.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
+EBUILD boto3-1.14.5.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 644 BLAKE2B 6d8196f27c8ec19e9d14cd52579809b40d036bea225d9c434125ddc4c210062a141d982285a2925400a34f7698ac660257e076bfdc3c9d067264af47ddce7b9d SHA512 b1c4acf5e1c9fd16381a43801c69a497505141ef3ec3d6aed6e2cced971fd310ade4714e436beceaf5c8a0d3b556e6f67b94e3cd3d296aa793b47c1b911894ce
diff --git a/dev-python/boto3/boto3-1.14.2.ebuild b/dev-python/boto3/boto3-1.14.2.ebuild
new file mode 100644
index 000000000000..062b762234a9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.2.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/boto3-1.14.5.ebuild b/dev-python/boto3/boto3-1.14.5.ebuild
new file mode 100644
index 000000000000..062b762234a9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.5.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/botocore/Manifest b/dev-python/botocore/Manifest
index b6f9d974c32b..5290e2658c02 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,15 +10,19 @@ DIST botocore-1.16.26.tar.gz 6458468 BLAKE2B e753f7dcb3d75a86da78536883e44cbd493
 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
+DIST botocore-1.17.2.tar.gz 6481390 BLAKE2B 009f8857be93c2fccb52e83176614401ae89835ea32fd0043248f7f66765d06e44df72ed31b5370cc1ed106cf45b531f4e4e7e7cbc3dc1d6e1524cb7914654d4 SHA512 ff19b1708686cbb574b01c9924a6acb7eaf7607b5f19a759d5c1dc1f7a7efae960e0c81d26d384101da5aaddc3bf0d8b4800d8908af34392d23779d4b9064487
+DIST botocore-1.17.5.tar.gz 6491397 BLAKE2B e6d45050e0f9d9919edff7dcea0866c9360fc8b8a09a82bcb6636621b49d7c9d06025639d8acf8740bf6d272371cabc9afff51e48214d240f1e81cd76abcab65 SHA512 2cf87d79a50f10d386907a0ef5b0e427b299b342d3661dfa64860828a0854dcd7f2ef3e0febdc30772aabf93efb39f4f35d52d3f28aec641e886fb5c05e30a3a
 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 1507 BLAKE2B 8e1f82403072c78012237af3372bac8edfab398085e42badc1cbc37ef65e969300976181b4fd3d388fea84146e5a5279e8ae3e29f65c8cb92e942ea8fd75a211 SHA512 8d0364652a3522beb6b484a02a76d034eb2d67501654fcde8072e1828d4c8bb8803b4747dee5df0c38b8190a237ebefef461a2a65c2ac19b4a1856c2568b2219
+EBUILD botocore-1.15.48.ebuild 1669 BLAKE2B e42d5f131c6466c9b2e6c6292bb5d2b5843207b92984800e5a0e6e67fc45c766cc5b7b027bc98e239e1d08665e6cb518d341b214bd717edafde64db6cb7ced05 SHA512 00e77660e59a125c83130b14d302f1192e307cc482e18e2bc67847b97128d449b94e83a5bd3c88bc71b52db0c0909f1f3e3695aa5856bfaf8e05032eda02d4c9
 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-1.17.2.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
+EBUILD botocore-1.17.5.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-9999.ebuild 1614 BLAKE2B 8a4ee3e4ae8733ab493bbf390bada866cedeaa3139b501566abc3dc8b56b6816328d885c84b2d4b2effe951d178c91641934129832260f07cd0d60024cd88635 SHA512 2a1c6901db5dee864b97e92ff15ae267f58814ade23fdf13e351dbcd7e6e3ed2faa3a189bd69872f0cc1623baf0c9b975ec616f95b4ed624d0389edef98b2437
 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 1c38902f7a11..cc5f5d311549 100644
--- a/dev-python/botocore/botocore-1.15.48.ebuild
+++ b/dev-python/botocore/botocore-1.15.48.ebuild
@@ -43,6 +43,13 @@ DEPEND="
 
 PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
 
+src_prepare() {
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
diff --git a/dev-python/botocore/botocore-1.17.2.ebuild b/dev-python/botocore/botocore-1.17.2.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.2.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.5.ebuild b/dev-python/botocore/botocore-1.17.5.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.5.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/brython/Manifest b/dev-python/brython/Manifest
index 03874387928b..a215f5062147 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,3 +1,5 @@
 DIST brython-3.7.2.tar.gz 10403203 BLAKE2B 1fb7778a961c68a873033321fdf7a5b24f422d52195ff1f0606384c76007ab87a1949ead2ffcd7b660b544a9833acf90b254a542ea8856510579bacd0be8477d SHA512 76bdbc005832b4980e38ff4bf2fd705291eb06ee6b9f0c4b25a90df9ab4e6da6638990abb37ebf526d064f54823a9b4ff387edd919db69b1eb3bfc8ed27d6290
+DIST brython-3.7.3.tar.gz 10403156 BLAKE2B a30c957925149f1b7eb736c1fcacd171dffb5846f6a343227596e759820c794c265befbb04137e797c1eabe8d9f0a3faa93fe425e4b0c13fda4c78b4c4bb1ecd SHA512 f234c7bc67d935e5bd5bfa8e473bccf90245ab4dabccd363bc5e9e01e1c9ea9d95989c5f8b323c158e286ac4a66106eb07722d1fcc82353ad036e35b4fda5669
 EBUILD brython-3.7.2.ebuild 753 BLAKE2B e58754d488cdcb191080848ae9848da3ea8bd57e9ae9e3b4e373ec4388645d9d40216ad3328089b7eccec4c27f74c4d5ba94348dd805c83b5094a42496abe30c SHA512 7849162fff9f817cbf48ed061737ecc01c260990971b79648aa52327428cec33a4e5adb8098e9b77be61d35dd7cd2069b80681655f55fe634ffbac54edbef205
+EBUILD brython-3.7.3.ebuild 757 BLAKE2B f47970819baf81a8075c0e4ffd5c57f3e44e9017089584ea73fc6f9bc4d4aaee1268494bb1ed288af4d02008f69fb28628492b379bf705c316fe7524f824f056 SHA512 0910457089178473cfe900d943a10d2362b50433719e3e642ce8bc11c848f2174c77e268697e4bdc96460a3c2017838aaecfcca46ce129fb3a44bb5d9b654105
 MISC metadata.xml 345 BLAKE2B ab7c78390c35a156fed3a3507ab979347fef95259f4083a28ba2c925356907158a0e7249cc4e6e46cc9117e418a07a3f91a67ba34163aa5be657ca37bf11b318 SHA512 ff1357bc421a8f96fe10ddc253035271616da444fb6cca11d3b263629c12abfbfc17324d06e744c95c319fe525763ff752db69aa3439edaa3fdc3e7e56c5bb05
diff --git a/dev-python/brython/brython-3.7.3.ebuild b/dev-python/brython/brython-3.7.3.ebuild
new file mode 100644
index 000000000000..715ffeb233e1
--- /dev/null
+++ b/dev-python/brython/brython-3.7.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit webapp python-single-r1
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index db1499cd8753..ffc6553cbac1 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,6 @@
+AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4df803512b28dd4692961ef0184642abeb3d8eeac68f074c50d639d1944393785eb0ca30f5aedbdb9e0adc4de2 SHA512 584e65fef1dd7ccc8c75404fc73780db9845e7a73796dcce80e4506f0d7c51ff7234d9d2d48c8ea873e4f304d7abaf3f6fe2662ccf847c094b7e54b567969cce
 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 1969 BLAKE2B 9e379c989e50e21b2aa85a74b08f7735483add3669400801ad80a426ac6b8576cd3c0cc880a2694ba5634e638b7358cd8f1817fbf7b7c7ea2150f97bb6a6b0ed SHA512 95bee542ecb3634790aa99f6e3ac2d460466264224d1bd242b58c6a8da1967521b0f5ac48a21a14bf41b00c7fb54d3a0214eff93e5ebcadd53ed2b5ec4703b2f
+EBUILD bsddb3-6.2.7.ebuild 1971 BLAKE2B fe4ebed73c2686c541e2f5dfc52c2d5e1ece020674d6ba85fd55584f3c012ed681783daad45293ff17674665bdf8d1661d28ac1109413a499aa383983485f6ef SHA512 e9b35e4d38a8a93f191dce9dde584542f412f28db9619ec2eb8908e63076d7007b170ecfc68e02025ec427dea691545d027e87aed60a253918ad5dfaf95d585f
 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 2636c7c14f52..d217d17a5f11 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.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} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -27,11 +27,14 @@ RDEPEND="
 		sys-libs/db:4.8
 		sys-libs/db:4.7
 	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
+
 python_prepare_all() {
 	# This list should be kept in sync with setup.py.
 	if [[ -z ${DB_VER} ]]; then
diff --git a/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch b/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch
new file mode 100644
index 000000000000..77d4626912af
--- /dev/null
+++ b/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch
@@ -0,0 +1,19 @@
+diff --git a/Lib3/bsddb/test/test_replication.py b/Lib3/bsddb/test/test_replication.py
+index 2fd6aa0..9d78241 100644
+--- a/Lib3/bsddb/test/test_replication.py
++++ b/Lib3/bsddb/test/test_replication.py
+@@ -105,8 +105,12 @@ class DBReplication(unittest.TestCase) :
+ 
+ class DBReplicationManager(DBReplication) :
+     def test01_basic_replication(self) :
+-        master_port = test_support.find_unused_port()
+-        client_port = test_support.find_unused_port()
++        try:
++            from test.support.socket_helper import find_unused_port
++        except ImportError:
++            find_unused_port = test_support.find_unused_port
++        master_port = find_unused_port()
++        client_port = find_unused_port()
+         if db.version() >= (5, 2) :
+             self.site = self.dbenvMaster.repmgr_site("127.0.0.1", master_port)
+             self.site.set_config(db.DB_GROUP_CREATOR, True)
diff --git a/dev-python/bytecodeassembler/Manifest b/dev-python/bytecodeassembler/Manifest
deleted file mode 100644
index 8e100460673f..000000000000
--- a/dev-python/bytecodeassembler/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bytecodeassembler-0.6.zip 52734 BLAKE2B 5634a77f0f250d5dd200496498080cb568ac4bc492745345871561ee5b68a58dc3b753df2dd87e569998c19723c869f4df88666b9d31cea07555a7fa928559b7 SHA512 95f90a1b6e1a307d8754eea301ae187783460fa8df3163f26253b8ebec16b31a8899a1d27c13158c5cb97763c7057f83b1dc1f642b5e2e9e5b844837a5208363
-EBUILD bytecodeassembler-0.6.ebuild 718 BLAKE2B 90fd83c7b44edbdb248722701482d1e9e356e44d5f6d798b253d80dde9fbc7e7cdf6fb5792460fec9821d7ff3061d414d71748714018073b224d1bf81af5eb84 SHA512 f37e6b06deff7092e5e1c449765b039f1d1df799cecee125ec18737a313a797fbd4c2b9da6175cf1e3761d29ea10c68c85c53585e4bea7acd26158ebc7e64592
-MISC metadata.xml 330 BLAKE2B 83e0eb794718ecd81d173738bcb6123c50671334e39b047c3ec06c133576b12b5c0f8ce3241e33b158d2e61283d58e56ed37d1bf6002f79b506a1d46330e722b SHA512 82d945c76a9881e9c5f8ffd049bb95889c6d44dc378c360dfc2f45140c27f41fb99169bf42b111eccfdf87801734fc2174dd9e6f1cf47cd6e4505f3524c64c4d
diff --git a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
deleted file mode 100644
index 6a95aeb72a96..000000000000
--- a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="BytecodeAssembler"
-
-DESCRIPTION="Generate Python code objects by assembling bytecode"
-HOMEPAGE="https://pypi.org/project/BytecodeAssembler/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="app-arch/unzip
-	>=dev-python/symboltype-1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_test() {
-	"${PYTHON}" test_assembler.py && einfo "Tests passed under ${EPYTHON}" \
-		|| die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/bytecodeassembler/metadata.xml b/dev-python/bytecodeassembler/metadata.xml
deleted file mode 100644
index 05fbea0b3259..000000000000
--- a/dev-python/bytecodeassembler/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">BytecodeAssembler</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
deleted file mode 100644
index 9b14081c1adc..000000000000
--- a/dev-python/bz2file/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 637 BLAKE2B a4c533252f379621f2af0ce4077332c42808e92e705433f7b72b0b999250801fa11e4176fe0baab694b3729e68a12b6298277e368308b26bd23f14d2a6800624 SHA512 3885e4b75efc009d7a011f0edeca9a4b1b291e84cd3b9106ff57b76f9cb1ee1dc83b93ee182d1106a2b73b5d49562cc65bdaa70ab37f1c16571b7984e739680c
-MISC metadata.xml 342 BLAKE2B 8cd4d551724a069a3668b91bb8218576e23cec6c450baab71b70868670d673d51bc11952b7f077aeb76493cdee5ba20ee4175d091e5ccb995fe3624e3772901e SHA512 e511170e43873344d2652837b823c3207a8da885487abe5bff9a90e0807ae4a7736170759e8e9772957cfb52a9d81e436f19f4327636d411f0f9d73ab31a9d2d
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
deleted file mode 100644
index 07ba09c87ab8..000000000000
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Replacement for bz2.BZ2File with features from newest CPython"
-HOMEPAGE="https://pypi.org/project/bz2file/ https://github.com/nvawda/bz2file"
-SRC_URI="mirror://pypi/${PN::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"
-IUSE=""
-
-python_test() {
-	"${EPYTHON}" test_bz2file.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bz2file/metadata.xml b/dev-python/bz2file/metadata.xml
deleted file mode 100644
index d46533634b2c..000000000000
--- a/dev-python/bz2file/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>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">nvawda/bz2file</remote-id>
-		<remote-id type="pypi">bz2file</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 7a24b3715f9f..5c63ae7be6e2 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,4 +1,6 @@
 AUX certifi-2020.4.5.1-use-system-cacerts.patch 797 BLAKE2B c870e8f65f63295cc68703a1ee15bd8ee30da6e1f038e988cc359227904e8a0f6f236752399677f145ec7d4bb5767b4e97456bc65bb9b5cddd25926ff5df37d6 SHA512 c2dfb2fa730556c791efb4aa320e0164608d24adacf91f90d9398e31744d98dfb1cdba82d00eea2d75fc09c9e2d7408852b1791378e20b8e4a8b3a6342da539d
 DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
+DIST certifi-shim-9999.tar.gz 3762 BLAKE2B 3ea85314e37a989d4894ea5fc89fb138e06c7912277f90466c6edb121c39f33b031bcc08346c4766c99fb193a2d53801aa1e8ef30cfede9a7e8247c7e443faef SHA512 ca2844f1680a019dbb5a440141d8ebaddd7c78ce47a23a48a50d2d857d012f90d74d4200168964787e31f16b1e9d7c981c033ff99f1e3ea1fa73cbbbf255edbd
 EBUILD certifi-2020.4.5.1.ebuild 1369 BLAKE2B 231ca1e683d6da675f3a02b93b60e43a01d6790789d0a07ac34f4c608af335a84cc0b26cbe03e7dbc9727be29924e42299036b636d07cb846be81a09ed26ea67 SHA512 3d6a2876e5ab7bc4d4307b842e28db3af6f89f3e56fba244c362b254bf16ee5eb2b45ee1a4a5e65cd8641f1e9f998d88e1c23ed5708b3852ae441babe727c16b
+EBUILD certifi-9999.ebuild 896 BLAKE2B d0fff5f6befad9010e913f1e84bfd80c06c5d70e11b210ea48680f966176e1fb9bff785f5f09271be807fc2c149cc8ce4374a0f18c9c665d02e4ae648181a062 SHA512 4b3c27da78aab44abc3a63b4bd4953318e8e8c48ab4f36af46cbf92c93519deaec6a7c11e78b2d276552f09876214cd4356d7fc7a65aa7d1ea5e3d371d077c2d
 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-9999.ebuild b/dev-python/certifi/certifi-9999.ebuild
new file mode 100644
index 000000000000..d05d83f13c9a
--- /dev/null
+++ b/dev-python/certifi/certifi-9999.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=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=certifi-shim-${PV}
+DESCRIPTION="Thin replacement for certifi using system certificate store"
+HOMEPAGE="
+	https://github.com/mgorny/certifi-shim
+	https://pypi.org/project/certifi"
+SRC_URI="
+	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index afdac326a37e..77bf2982642c 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -2,5 +2,5 @@ AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f655
 DIST cfn-lint-0.21.6.tar.gz 2149548 BLAKE2B 36bb80d8b656eddc0e0a00e4728e46ff05f12ff93d70295a045602f09d570880bf087f25165ed21641e80f096b93e3cf4c9cf97b6498b330dc53beaba67aa492 SHA512 c263e6e5ccd03ff5b843e9d4ebd74844f1b4053fa766f5300e4cc66745c42e82771e6af73cf950c81bb66f09b4afd5d438bdcf8489a3b9d61d562a7145d04297
 DIST cfn-python-lint-0.30.1.tar.gz 4137425 BLAKE2B dd4f7d449236e567e7ea0fa662cbe983b6125a6cb557ee314de0e6647c5756b0be450deec7778ac69f1cec95b594c8c74a0a2f56ea229b7dc28ffb918983e6b3 SHA512 67b72973dc174e0de4980606b7886459233fca516a0587b91319127c4df0ce2647bbdc3302d68b63916654a76f4c9405c2f27cfd5e0ad737b00724e403815477
 EBUILD cfn-python-lint-0.21.6.ebuild 918 BLAKE2B 2971e8c31d779ad659f11de9afb3a2f53358bd74ec6e7456224f90de4e1abde020ef625f852c67dde12c1a958e20b11e949725f132bf29e45ade4bd3e6010e0d SHA512 4d0743f9ab3897c506de79426d43c5c00d4933b4618a728ad8e6119319a96a5868a237ca1d61b63645de4f79c15d58b4dc621665c8bd01571fe2637417202935
-EBUILD cfn-python-lint-0.30.1.ebuild 1098 BLAKE2B 75350558a5e0fed28f92c7c5842a0b18ae4fb8c39a352579d4ad69e31da8a297c8e0011d8c6b3dddf8e2969526a298c32b1661a4eee5b27d22e89162ac5d611d SHA512 549f0c718f59438fc50dd15a11290919f31c7ee74a5c7380a523b807469e42f903da145586b65813f6d9f48b38dda5d26100abcee62cca6358ae4503ab65a1cf
-MISC metadata.xml 471 BLAKE2B 3f9bf2f5249caa0794d35fa4e56d2504ab5576cba4b8d1e22d1d8eab30bf4f2e9fef843b4e6d222c478ba5edef63d7805a854ce788b7f2ba51d46aeb60ecdb81 SHA512 99c9ad08011f920bc7d9e5399e9b230eba05bad6da18be859211f83a0895b9a0a74613d854338ae9de9dc3f4308a7701dee819722b5b3921aef4449f1ca45d8c
+EBUILD cfn-python-lint-0.30.1.ebuild 1137 BLAKE2B 6bda3d7576a5f76accbd6740deaf014a1d52ee28a83603c18f8e79d5c1dea29be4b5211f857fc410f216bab99f2b2c58902b66e3801b1caf36c53eaa0892dd08 SHA512 7f7f2348bcc00607f7055d2c6950e7d59a1717fa9b74e3589bd1511841d9ff1142927ffff86d951ad7606107118ff921bcfef6bc086faa5ac2a735f8df011d85
+MISC metadata.xml 572 BLAKE2B e7e0e4631f4ec0e9b668f664607b89790edcaeea43c2da8b9cde1e9671eb5c18221d61d8981b1f23773b6d0582883d879b70d1850bfb4ab8a7bbfad60456b286 SHA512 6677b1994867314be92d0a95e2115102d8ef87f4137ac26d488957ca7d34e77cc618a308c8fb648405f28eecd872c8965dda5f042d410d5084c3dc38d54994ac
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
index 1106dad78aa2..a707f4ad926a 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.30.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} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -16,7 +16,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.21.0[${PYTHON_USEDEP}]
-	dev-python/importlib_resources[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/networkx[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-python-lint/metadata.xml b/dev-python/cfn-python-lint/metadata.xml
index 8b111978657d..6d80f9eedb6b 100644
--- a/dev-python/cfn-python-lint/metadata.xml
+++ b/dev-python/cfn-python-lint/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">aws-cloudformation/cfn-python-lint</remote-id>
 		<remote-id type="pypi">cfn-lint</remote-id>
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 88fb3e3169a8..6ce0d9a82b55 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,7 +1,9 @@
 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
+DIST chameleon-3.7.4.gh.tar.gz 135403 BLAKE2B 5cdcfb60975283a8c4d7623e002962dea336cf4414a9a212e9f9bab10ece4627ec36c80744d91428daea187e50956be89be128f25966e7d6069ad141992cfbde SHA512 429a2ff78b27996ee9c21cbc076614accf328e880f03f084e52395987a36c1eabd679428bf8400807bb909a60a31a5c899218640be0d0230ded7309e9ba6753b
 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
+EBUILD chameleon-3.7.4.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-3.7.4.ebuild b/dev-python/chameleon/chameleon-3.7.4.ebuild
new file mode 100644
index 000000000000..6f8ba1fc5c20
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.7.4.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/characteristic/Manifest b/dev-python/characteristic/Manifest
index e7bd2074f293..65ed26e005d6 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,3 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r3.ebuild 847 BLAKE2B 702ba654c1fdb8c5c73360c6617960acf0be024078bb74f66b6f5779c8520e6e7950fe066aa4c66d97266ec1c0c90ea188fde66c49e18fbb088e5ea7bd0e3970 SHA512 7e205251989079d12b760ed525c717ecbd03411877634bdc66f04ab1781d59e83f5d465a617b52a8190162d60c95a7727e98633dfdda400367b84450ef98d84a
+EBUILD characteristic-14.3.0-r3.ebuild 669 BLAKE2B e59bdc86ce8ce52b9d5d9957a0d2e0abc25a881e5b7413604508db1305f068043ceafbcbd045ce6bbcad7b6dd84c87ac55a9466193fb75ef1b367d5c5e7c7494 SHA512 782ae8943e36d14b284fd655340409c55dc2a0b80650858c929527a9601434ac27d17ba764483a5038a53c4040ff7b894fca96ede16615984fa56120dc01f6b4
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index 3d93f1c7222d..2fe3077b4082 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.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
 
@@ -14,16 +14,11 @@ 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"
-IUSE="doc test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
 
 python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
 	sed -e 's|\[pytest\]|\[tool:pytest\]|' -i setup.cfg || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 459c2951a605..efaee741a92f 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,3 +1,3 @@
 DIST cheetah3-3.2.4.tar.gz 315044 BLAKE2B 5cb36364f424acf87593b3f18b5709d1a161dd3fb9bc1f4cfb6fe7c22d2515c852d5d7d0215692274ffe5437267e3232fcfae3d76c592cf66d8927fabdf37953 SHA512 64fbe95fe8d5f3185168ba780e106a46caa0656272235168df603eff50dd6e476eed041658a1e11ae12ee10d148a001c32a23677a1ee6da5b6d43e20e4d1e36e
-EBUILD cheetah3-3.2.4.ebuild 1112 BLAKE2B 893ecf71b76b88c108f6d0f59f4d20bde9724b778e6da63145f4fdec48a63e753f61abc9a359d87f0e1f56cfbc406681ba637649c415af6b935c841d707a1a71 SHA512 cc45c7888335b17bf6e598ec1e2d670e61aacbce11d1ca3ca58acdb1f90efa57ce3752e2d5f5f292937c357ea7f9b549ec0418a88ef309a545bd94812944e553
+EBUILD cheetah3-3.2.4.ebuild 1111 BLAKE2B 929c5ce9da8a99bdc9ba0daf4dae1970e662b668c4d133449148b39abfb6ace991f2d30b8d4df09a6208258ac15eab8c991afd82ac15f5b6ee1e649dd773b7bb SHA512 077e5fc0a1fac2f669d6d87b5ca04d20f45ff5886e91d0b2a05860e5dcd9035541be3d4201b4b6d4b7ccd46ee300acf22c859e65a9502e03f9b608683c441f91
 MISC metadata.xml 662 BLAKE2B 3dfe6898c1c2b60050da8427fd4e51a07ba7870120ce491166b9fd222bbaa49e7df7ba3afafe8b159a7b60f781da67dc0dfdf03f085e813cb3f6d59169ecc526 SHA512 b15fac64b057cc9216aaa21002332ec348e89a618ba4c32dd8b9622afd17d7d8db6ef6c3e7c645ad0a03b306c50b79322f5ad1866db93f1033e69b1c7d6130a1
diff --git a/dev-python/cheetah3/cheetah3-3.2.4.ebuild b/dev-python/cheetah3/cheetah3-3.2.4.ebuild
index d66ca7e2f4c2..392553481873 100644
--- a/dev-python/cheetah3/cheetah3-3.2.4.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 IUSE=""
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 5e4536aae08e..78effb667b98 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,5 +1,7 @@
+AUX cheroot-8.3.0-test-unixsocket.patch 2069 BLAKE2B c948f064e6d8f7d9b650d3fdd00be71880f2df04c928093b7e0e61c6095c854aaa1bfe0ca85e1afd480102826ea6c81766374d2886b916f98ce23e18613a5225 SHA512 0e1f04fa069917eae4267408b6f791108805ce831612cd78acf53e25ed435e38cd542b3a8d0a75cb149e55fc35daf1c24d5b6637899303861bea2e810f6e3889
 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
 DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
-EBUILD cheroot-8.2.1-r1.ebuild 2250 BLAKE2B d7674ffe8cbdaee13044759f7397e634e44b914bb65d324ccccc2bbd01c2c6482eef8f9a7453ccf88f25d8f0d3849753d4425d682e0246bfb08b0539ba88c4c4 SHA512 d4c2e6d6eeb909b98e8cf143b2314bef8a6a0b3147ee5baa7d5b5a79e3202163438d82fd6acf65f0696bdf5233e85f6986f35a54783a615e0ad004f4d6336051
-EBUILD cheroot-8.3.0.ebuild 1185 BLAKE2B 33151eeb2f26465dc133586253544c068b55de29e1b6d0a93239cf2af223c333e62a8a329e03f0ae9fb56ae9651d66700c3356b05f8617b040ac71a2d336902e SHA512 8f21b427089443b95326c28664a43a94bd2a4675bf94750c965bf08385fbb0cf6377cb68baf86f8b106594203d705e5461a8d288602b10bc74dd036702c1ac24
-MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
+EBUILD cheroot-8.2.1-r1.ebuild 2249 BLAKE2B 75bb493262711a58088d4539c27157dd37638e521e89c7e2f2675421d38346a62332dc9b71c183d56a7560f491636f05c894d01aed0a8b10c63cd5d08e5ab006 SHA512 8ca74fe3a2a5160b228cd7009550a8d9f59dc6c85c3614167716c4d1188aeece0c774ab4d711e76615476ab5315f2b4c9133e6d4b1a2df967e120d05717a99c6
+EBUILD cheroot-8.3.0-r1.ebuild 1384 BLAKE2B b65c177ddfb5568c3a20f55817961e5b19ff3b3794de9b9b492da1c7c105687aa234e4200e6946434e25e5fdabdd877381f7ae364393f3c31e037231b4129c18 SHA512 0fe2578a9a4528b8c81824287126f5fd063186384db77f36efc03bf894a70e761e30243981fced218fb2d25bae410a0369a818381c832def7715f6dd8005fdae
+EBUILD cheroot-8.3.0.ebuild 1184 BLAKE2B 0e4475484fa415fd60f57fcfecd7de829dc1a8e088f506c14e742fbd4e86b2a62f80161d1bdce869aff4c82ab2842943765c2d462a69b4be7049059561942b7a SHA512 da40357479d4ae2332d8f59cfbd0ab31ad5b281d81ce87906152dbb5ec4f3f6a5bc807c1276e8473112ff95720beba69cdbb4f2306a85fea4490663dbf366c7e
+MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
diff --git a/dev-python/cheroot/cheroot-8.2.1-r1.ebuild b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
index 903b9814c555..1cb11261efd9 100644
--- a/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 # Unit tests are temporarily disabled for this version, see below for
 # what needs to be done.
 #IUSE="test"
diff --git a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
new file mode 100644
index 000000000000..452444ad649b
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.3.0-r1.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/cheroot-8.3.0-test-unixsocket.patch
+)
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
index 1c643f903907..5a42020fdd3e 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.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/cheroot/files/cheroot-8.3.0-test-unixsocket.patch b/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch
new file mode 100644
index 000000000000..311489565301
--- /dev/null
+++ b/dev-python/cheroot/files/cheroot-8.3.0-test-unixsocket.patch
@@ -0,0 +1,57 @@
+From 6ead1efb37edfade4dda60e48d1af8fe89be3cdc Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco@jaraco.com>
+Date: Sun, 12 Apr 2020 16:28:00 -0400
+Subject: [PATCH] Remove client from peercreds tests. Fixes #276.
+
+---
+ cheroot/test/test_server.py | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py
+index 80728d66..6c4b53ee 100644
+--- a/cheroot/test/test_server.py
++++ b/cheroot/test/test_server.py
+@@ -23,7 +23,6 @@
+     ANY_INTERFACE_IPV4,
+     ANY_INTERFACE_IPV6,
+     EPHEMERAL_PORT,
+-    get_server_client,
+ )
+ 
+ 
+@@ -171,19 +170,19 @@ def send_payload(self, payload):
+ 
+ 
+ @pytest.fixture
+-def peercreds_enabled_server_and_client(http_server, unix_sock_file):
++def peercreds_enabled_server(http_server, unix_sock_file):
+     """Construct a test server with ``peercreds_enabled``."""
+     httpserver = http_server.send(unix_sock_file)
+     httpserver.gateway = _TestGateway
+     httpserver.peercreds_enabled = True
+-    return httpserver, get_server_client(httpserver)
++    return httpserver
+ 
+ 
+ @unix_only_sock_test
+ @non_macos_sock_test
+-def test_peercreds_unix_sock(peercreds_enabled_server_and_client):
++def test_peercreds_unix_sock(peercreds_enabled_server):
+     """Check that ``PEERCRED`` lookup works when enabled."""
+-    httpserver, testclient = peercreds_enabled_server_and_client
++    httpserver = peercreds_enabled_server
+     bind_addr = httpserver.bind_addr
+ 
+     if isinstance(bind_addr, six.binary_type):
+@@ -212,9 +211,9 @@ def test_peercreds_unix_sock(peercreds_enabled_server_and_client):
+ )
+ @unix_only_sock_test
+ @non_macos_sock_test
+-def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server_and_client):
++def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server):
+     """Check that ``PEERCRED`` resolution works when enabled."""
+-    httpserver, testclient = peercreds_enabled_server_and_client
++    httpserver = peercreds_enabled_server
+     httpserver.peercreds_resolve_enabled = True
+ 
+     bind_addr = httpserver.bind_addr
diff --git a/dev-python/cheroot/metadata.xml b/dev-python/cheroot/metadata.xml
index c8449665a6e4..20224dac30c7 100644
--- a/dev-python/cheroot/metadata.xml
+++ b/dev-python/cheroot/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">Cheroot</remote-id>
 		<remote-id type="github">cherrypy/cheroot</remote-id>
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index dbb17b5f8581..72c5d7eab718 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -4,7 +4,7 @@ DIST CherryPy-18.1.0.tar.gz 682792 BLAKE2B 0e072bf21656778ff8d64e87a6b19c8c5e9a3
 DIST CherryPy-18.5.0.tar.gz 685362 BLAKE2B 36178ff6e374a89aa4fba9ba34947f1558a7bb3676f014528bb081efa9608ed70648bf2c46b8c4f95b8b14586a93c513ce342955677564f9202733104ba07102 SHA512 6ead115ac2a067cc9f2cb83117b8c53aac8a2a1580159993b7687b5810a41b64d1d1c603ef75a12660fe7aee9c6f403c8cb7bd5e78564f71dc813ae7f28b65fe
 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.1.0-r1.ebuild 1879 BLAKE2B e6ca418791d306d45ce0f9d4a189e1c4675027dc14e5ad099a139195e3dd40365daea4ffa03f59e3433e464b4ba80c9c1186c24969d50293db6e836ac9408c1a SHA512 7ba691e2b421503f881930f1a829a4335e1b85037924510afa09e0c0583f879bc92d44e080091f54a82714a61694868fbd66ac42625ddc9b8228e736e4dbae51
 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.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
index cca674e426f5..ef09dc2c08e1 100644
--- a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="ssl"
 # IUSE="ssl test"
 # See below to see what needs to be done before testing can be enabled
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 44fdcaf7221a..9819875e8a3c 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.ebuild 926 BLAKE2B 9234b7b3e5159f7f9e9d99148a6b784be909d9241484200c6578d877e4b1f1266df92c16034e8758bbd0280a1b626b5a5f914b94b37b0fa1ad60306f1c09b215 SHA512 2afd8a595225835e276a62edfec73d0834a5b3d5d4fedf8416ce115db9208da87cd3f3ec5675fb46a4205001e5d734c7479ea5eef86571d1e2a54377fa14e9ad
-EBUILD clang-python-10.0.1.9999.ebuild 903 BLAKE2B 570e777850703a86d0432b3ee69b50cd7c7d386f2bc0ecc639b1eabf0d179501669c4975e1347407fa5ba5f26d7d998271eee75ac5a986d3b5fcf9a27ed5e329 SHA512 a58cf75629980e340de3041b3bdf60b491a81202690afee4024c1798a0488f539600d7697cf09b08110f0b3677dc62a1524ee9f0445284de376b3fab29a1d4ed
-EBUILD clang-python-10.0.1_rc1.ebuild 903 BLAKE2B 570e777850703a86d0432b3ee69b50cd7c7d386f2bc0ecc639b1eabf0d179501669c4975e1347407fa5ba5f26d7d998271eee75ac5a986d3b5fcf9a27ed5e329 SHA512 a58cf75629980e340de3041b3bdf60b491a81202690afee4024c1798a0488f539600d7697cf09b08110f0b3677dc62a1524ee9f0445284de376b3fab29a1d4ed
-EBUILD clang-python-11.0.0.9999.ebuild 903 BLAKE2B 570e777850703a86d0432b3ee69b50cd7c7d386f2bc0ecc639b1eabf0d179501669c4975e1347407fa5ba5f26d7d998271eee75ac5a986d3b5fcf9a27ed5e329 SHA512 a58cf75629980e340de3041b3bdf60b491a81202690afee4024c1798a0488f539600d7697cf09b08110f0b3677dc62a1524ee9f0445284de376b3fab29a1d4ed
+EBUILD clang-python-10.0.1.9999.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
+EBUILD clang-python-10.0.1_rc1.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
+EBUILD clang-python-11.0.0.9999.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
 EBUILD clang-python-8.0.1.ebuild 1110 BLAKE2B aa66d47aef5cad5d7819dc064d618a70e1b38fe6b6cf7c8ea15ac3a6b814770e95abd86a482f5fc874f4bdaf230c3330c0fdb39df1afd88e2c40ae9a6349b49b SHA512 a5b3aace7ab68a0bf9e8624e2b1b23f83dc79a299090479ddde3794f2ff7e344459e8c7167b256748a57ce73099272c2eeb8d8778901c710ccbb08d2c6c12a35
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild b/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
index fc791c8175c3..e1b9340c6319 100644
--- a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
@@ -27,6 +27,11 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	cd "${WORKDIR}" || die
+	default
+}
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
index fc791c8175c3..e1b9340c6319 100644
--- a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
@@ -27,6 +27,11 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	cd "${WORKDIR}" || die
+	default
+}
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
index fc791c8175c3..e1b9340c6319 100644
--- a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
@@ -27,6 +27,11 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	cd "${WORKDIR}" || die
+	default
+}
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index ff40d9be1e3e..1e29db0d3b81 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,7 +1,9 @@
 DIST cliff-2.18.0.tar.gz 77905 BLAKE2B e371c4025fd3bf0543d3f4f038ff891a27f8116d3c833a2ded4e9f619879501868c3acf9e2f1c36023b79da404dcb69f8a8c31fbbbc2847b6c7dfabbd7ad666e SHA512 0748f8f392b11ceaa63f516860f6a339a9bc1233134562b13384bcbaff0b9e84e82a1544658ea3bf9c0fde973c563bfa1e92cc418a2fef0bfdced3f88d93058f
 DIST cliff-3.1.0.tar.gz 79037 BLAKE2B ab7fd085a222d93deab2d97649be45510f868c7b6ffc32bca6a6cfd7c6c66033f831fa5682d753d8111ce869d94c788c204610851034fdd020f829889062a066 SHA512 f6b74a91e75a0715949a245816f60563c78aa23b03f896240650a190b9d9486e0079081f3fb12acc8aa610c411c7571a330a94f2884ec00b6f893a0d9bebdcd4
 DIST cliff-3.2.0.tar.gz 78613 BLAKE2B 0d6a253b026142a91f70cc8af8041dbbef6854b86c36fac7fbe0929c9a13742aab7be8a26c1419947e6eea550ee3b6bb2985c92bdbfe7b76cb3fbab7fc82e56d SHA512 dfae68bb3ef66a562e9bbb0f15bed61f144d7be92eab0553d01dcf7c7349c8e41ef51f98c3a43997cda09031c08db6db1add643ecd6a9fd4d27ddd61f87233d5
+DIST cliff-3.3.0.tar.gz 79680 BLAKE2B 844910bc588fb80ee6645735c3be2518fb00fb255eba67d7cf8a572ee9153cc5c1af399296782254d1d94aab89dd14a7107174b5c580cd842eddd62f4aeae155 SHA512 644dc14817e18dbabe8a33bd48545b27f5053f3b2c5be386c7752fe0a89d3de02aa70f6a5d7b0dcc32fb26f73773c744ba17e916c1186d93b8609caee5f08d6c
 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
+EBUILD cliff-3.3.0.ebuild 999 BLAKE2B 9467a5a29e1796e66c34a0fee637eb57de78ed78ce561819e8b3a60074f292ba55cfe25458a96802e66091d17a725d15f045456ca5bb5bbe3ebe8eba0147360b SHA512 d6c7a0a2ea053936f6e134067c1b65c10f22f5afbf1ecf754f67161965bd27e2b6cd93737b683c656169a3ec8b25ee1190f0c21998f7bb33126e2299a142f04b
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-3.3.0.ebuild b/dev-python/cliff/cliff-3.3.0.ebuild
new file mode 100644
index 000000000000..a7fef18e7137
--- /dev/null
+++ b/dev-python/cliff/cliff-3.3.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/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 9e99ed212098..04613fb10f60 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,5 +1,5 @@
 DIST cloudpickle-1.3.0.tar.gz 46220 BLAKE2B a7ff773a38aae3b4a404ba7e931de06756ce95d5e45e4c204ac7ed93a3d2e7171667aa1995434f249971b2774658d1766935a7d7d3675cd4c727180221adb299 SHA512 b128a9088b36460bf3cf4edf4876ea768291de3c10c9cb6919507c4493a808136edcb819a98eb69de610e7162a96f859bae2f5c5616b558d9fea102835df611f
 DIST cloudpickle-1.4.1.tar.gz 47459 BLAKE2B 642cac2244060ccde18c31f0047d5d957d69d396901ea31e04d28c5d7d55cd8f58fcf199054752f1a644667a5fd73a1ccc2e33b20bdfcbc4e71450aeeb832ce3 SHA512 3232dfdf91141179be510282a1fc60fa5891fffd1f012998c6a622957eabdf9deecc7431196ae70de01b2e498c97981c83ed22ac1ed6f3db8ba68ee0a9a26bd9
 EBUILD cloudpickle-1.3.0.ebuild 784 BLAKE2B 9a57005675a0e09d52d7d789b40ece4b0dbb809845e63ba77a0e7b3e36e4842c53a6c0fbc4b62697ef726cd5040fe100175da26cdc3252eb761e94eb189e6219 SHA512 a464a28cd1bf0be663feff4a65b46a9a753d37e4dfffbe51a896e3c9737ec17fe7069b6994ce609d9c8bd874807b284e46b45481eba36c72c7327223518d97be
-EBUILD cloudpickle-1.4.1.ebuild 787 BLAKE2B 6405dc103f899bbdf30105404ce78aa739f8f380c37134c6f0e4a3e0db36e39192eb26a23eeee6e924ca1c347e4186531e9bffd2913479f0cd6ef883de692e49 SHA512 a8ee8e5dd0d452963c95cd720a71a5768e9c35a06a0566ff83963638f6d4839bece5363507542649dcb7b153b62548e2887114045d605b6c5ed9f353c4ec0eb0
+EBUILD cloudpickle-1.4.1.ebuild 739 BLAKE2B b6eaf566b05b41b8b78bf03a2ef052425942b62bc03d12b4f8e7df83cd9783aaea8d3b81422630f5143de6c7af1d811a2309611d32b18bf915341844925a4821 SHA512 8a9ed92bdb11c01799ffa475aaa0dd5742a740357fd72dc630106860a2f1f9667be24d8c037a5cf51735848e70640a24bb84b8a48cf6f66de42616a836cdba38
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild
index b938479134b0..a9f5293b0924 100644
--- a/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild
@@ -2,27 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="https://pypi.org/project/cloudpickle/"
+HOMEPAGE="
+	https://pypi.org/project/cloudpickle/
+	https://github.com/cloudpipe/cloudpickle/"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests pytest
+
 python_test() {
 	# -s unbreaks some tests
 	# https://github.com/cloudpipe/cloudpickle/issues/252
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index 88efde20da78..a8d104479289 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,5 +1,7 @@
 DIST configshell-fb-1.1.25.tar.gz 56900 BLAKE2B 00f16c401a87cde0e70730ec74fe5885af3ebf22c3745851661fea7de874f5609c49e0b7c521c5d3db16eec903e0f24331816acc8e19a080043e8399c98bd18f SHA512 338eee8eb7b0fad533b739bb0c9460757cdb90103c44c37568dd86158431b67e1b0ab050afe2670abbba96c5d8c18db9b107d9f7650937a2be7f53fad26efed3
 DIST configshell-fb-1.1.27.tar.gz 57174 BLAKE2B 4f1f4dd6b641fc5843956b3d88f43456f326af16799b770b1224ba029903fb6bfb291101ae780f48fa126c9e5482b95e5e545121a11afc9d8535dd23be3445c1 SHA512 53d81b939f393f88141f2c158295a5297850e2a908b6124d085b2ae185a2093b877bffb0536a195b2743057bbd3131c75daeb90a4b83b6305baa89463e30c685
+DIST configshell-fb-1.1.28.tar.gz 55076 BLAKE2B 8f7ab1b6172412dffd77d1ba89082f815b90167b5bc7e15c26c26a101e2e8a0ab5bc716c040f41124a9d5a5038b751e4cd882124d70fe2fda2b796ef43dc97c8 SHA512 7d05fdfca5646ec05d5f4b2ea499235237f5f3157c1330ed46dcc76ce8dea5cca0e3ec4d4376db2ec8358438737fb54286cb0c712c0f16637128670d2858dd4d
 EBUILD configshell-fb-1.1.25.ebuild 587 BLAKE2B a793b530cfd2fe282f8457633c5b1a671bdeecc21a0162d142258a800339fabf378f61db77e8954af4de8fbb261e4a95f41db038640912fc96c5baf37902e6c2 SHA512 bd2338d82918a47ab83326b992c71a5c9e39124536c30aecd157868670a8989e87c7abb2a7a9f584c1a94b5490b46229deb13c3b996906053d3453c127b80c7e
 EBUILD configshell-fb-1.1.27.ebuild 516 BLAKE2B 533cabf9dc78fd7b0c987a7786346243a9df3c04d6a81afb3261556e13ec9e25cf744e88d7d394f21eb69d2af24f6cd19241454a7b06b4710ecab63313d1d2af SHA512 ae9e780aefa90bc1c4437c8f13ad9c32cddb60647ead640871e24c37e37b61a4cf3ac4d0731c75ccb52be0862bea703bcbbff95b8b32843d2d2ebfed81e6d213
+EBUILD configshell-fb-1.1.28.ebuild 516 BLAKE2B 533cabf9dc78fd7b0c987a7786346243a9df3c04d6a81afb3261556e13ec9e25cf744e88d7d394f21eb69d2af24f6cd19241454a7b06b4710ecab63313d1d2af SHA512 ae9e780aefa90bc1c4437c8f13ad9c32cddb60647ead640871e24c37e37b61a4cf3ac4d0731c75ccb52be0862bea703bcbbff95b8b32843d2d2ebfed81e6d213
 MISC metadata.xml 937 BLAKE2B 2d5ded6950c4286478b6867241f974274b06fefb406117b7b1b6123d092f680e998967c0892fee40f268eb6530b62ac99f4a23859e0d208b6b1b73c730c3343b SHA512 fc2d86ea29566dc96e24e9126c28f76d83bb97e11bc336aef563595602a8342f7e1c2f9fedf6db1aea603d736e5dab3fef7e89e5b8ef4e3e5bca671019a87e73
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
new file mode 100644
index 000000000000..d38b29bb9987
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.28.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=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/contextvars/Manifest b/dev-python/contextvars/Manifest
index a227fcbb7e19..01f625a4ab3c 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 522 BLAKE2B b501b04c29d1f82198310ac6065b4d5c159e3e27e9ae028b2ccb1c8e6c29fc8edc51672cf9eb40b52503d52983fc7fad8c57b89885931bb834b05778e698ab55 SHA512 ac2272e69665782d3c7d66659d5e90b8752c16b3d3775706915b14332053f38852bba7ad7094d515202ac442b31db0282990c242ceff2275b54b98812410a532
+EBUILD contextvars-2.4.ebuild 521 BLAKE2B 46861ed01caeb9d70e4e12b50b32b9817c2aa302899e343e7c5af9dc44fabfb3bde0ff5ccd8adb77898fee9e082d0b9877cfd7d85650dde765af2e4fc9222f43 SHA512 fcc3dfe1dd6b546e83a08f93f840ae956821ef4d0e7da3182373bd3f6304ee4de9d63e2e930200d6bb0a75d595ef103afc4e420828548935c3b0ec3d01d62ba8
 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 d0d2c47baf94..23482225624e 100644
--- a/dev-python/contextvars/contextvars-2.4.ebuild
+++ b/dev-python/contextvars/contextvars-2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Backport of Python 3.7 contextvars module (PEP 567) for Python 3.6"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index c2464a9abbfe..be20e8beb853 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -5,6 +5,6 @@ DIST coverage-5.0.3.tar.gz 679171 BLAKE2B b87b256ecdae0b63ae08ed1aea9ff1f4177ec5
 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 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
+EBUILD coverage-5.0.3.ebuild 1735 BLAKE2B 661f0c172c6d79fd64486c3e7bd41c9cf1805ee9cea6e1ab5e4243051812a6e877ff1a556fb46b4bc35e5be1bf3cf89a1e7f66ba6fabad1e072a33fdfa69c8ae SHA512 c6ab16f2a580442b73afe5140d151fda348e11a6dd293b031abffa815bcbc9222a7773c3a062ee5ba67e1da5697dc3ed2a724300e130e3b9400ec7129c6bc25a
+EBUILD coverage-5.1.ebuild 1883 BLAKE2B 6385adcfa1ec02f0ed7613119f9dbb48425ca9adf6439cb2c7928934b7a1e3144cf386f8f86c65fe0ba252210bab2b3e76b8d878459d6b2b0ab3530a4398cab0 SHA512 96a858ef2a989eace4eff4e64c18b28d0865f4cd7f8207151405bd44aa8f5e42fe92c7af53d4ce0c6a4945757429d40752125d32fc08eb282c63fc5de0b6931d
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-5.0.3.ebuild b/dev-python/coverage/coverage-5.0.3.ebuild
index 9e5bf5dc484c..1598ce740058 100644
--- a/dev-python/coverage/coverage-5.0.3.ebuild
+++ b/dev-python/coverage/coverage-5.0.3.ebuild
@@ -20,9 +20,9 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/PyContracts[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/coverage-5.1.ebuild b/dev-python/coverage/coverage-5.1.ebuild
index 3a8dd9ab4096..6813525e24e0 100644
--- a/dev-python/coverage/coverage-5.1.ebuild
+++ b/dev-python/coverage/coverage-5.1.ebuild
@@ -23,9 +23,9 @@ RESTRICT="test"
 
 #BDEPEND="
 #	test? (
-#		dev-python/coverage[${PYTHON_USEDEP}]
 #		dev-python/PyContracts[${PYTHON_USEDEP}]
 #		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
 #		dev-python/mock[${PYTHON_USEDEP}]
 #		dev-python/pytest[${PYTHON_USEDEP}]
 #		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index f0bdadb0f50c..88be591427ab 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,5 +1,6 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
+AUX cython-0.29.20-py39-classmeth.patch 1373 BLAKE2B 1b4a06125513ea727e186e217b27fe17871bacc8cf835438e16683c67f136448de75efe7336c8e7622731966f2f1b2f8d9ef02f5c2697c31e251c99f53fc36be SHA512 0a9e063586fc945bfbdf6f213540029a2864074d487d0554b11f8d3db3ea078a6675d7cb86c1f68c30c7331e832de9fd48041e628c7481d51c9b8d0f957fe5a6
 DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
 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
@@ -9,5 +10,5 @@ EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f6
 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
+EBUILD cython-0.29.20-r2.ebuild 2009 BLAKE2B a3b9cdd80aa5e054444f9098249e39904c574661b447dbd89c3042deb09573ac2640871437a5be32bae6e9f13152c934883fe2fffb3f179866f4027c8d57da04 SHA512 88f4c63a503eb70a92da9f63993a3b528fb4ccaf23ad8e6f172f7852f4a484373176ef3a2377dd5dd1d6a37bdad2420c46fa17f9131cb8c9c05fe4b3c22edfd3
 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-r2.ebuild
index 8b4b6e7acc61..c536c20a045e 100644
--- a/dev-python/cython/cython-0.29.20.ebuild
+++ b/dev-python/cython/cython-0.29.20-r2.ebuild
@@ -31,6 +31,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+	"${FILESDIR}"/${P}-py39-classmeth.patch
 )
 
 SITEFILE=50cython-gentoo.el
@@ -54,12 +55,6 @@ python_compile_all() {
 }
 
 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"
diff --git a/dev-python/cython/files/cython-0.29.20-py39-classmeth.patch b/dev-python/cython/files/cython-0.29.20-py39-classmeth.patch
new file mode 100644
index 000000000000..914269a5a232
--- /dev/null
+++ b/dev-python/cython/files/cython-0.29.20-py39-classmeth.patch
@@ -0,0 +1,34 @@
+From c29a7818d3b6806a457af698aec446d3d28d4f80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Jun 2020 13:45:21 +0200
+Subject: [PATCH] Always bind Cython functions in py3
+
+Rebased for cython 0.29.x, and made conditional to Python 3.  This
+does not solve the original staticmethod problem in Python 2 but it does
+resolve classmethod problems in Python 3.9.  Therefore, it unbreaks
+other packages on Python 3.9, improves overall state for Python 3
+and does not introduce regressions in Python 2.
+---
+ Cython/Utility/CythonFunction.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Cython/Utility/CythonFunction.c b/Cython/Utility/CythonFunction.c
+index a65c8eee36..33d0a4750a 100644
+--- a/Cython/Utility/CythonFunction.c
++++ b/Cython/Utility/CythonFunction.c
+@@ -548,6 +548,7 @@ static int __Pyx_CyFunction_traverse(__pyx_CyFunctionObject *m, visitproc visit,
+ 
+ static PyObject *__Pyx_CyFunction_descr_get(PyObject *func, PyObject *obj, PyObject *type)
+ {
++#if PY_MAJOR_VERSION < 3
+     __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;
+ 
+     if (m->flags & __Pyx_CYFUNCTION_STATICMETHOD) {
+@@ -563,6 +564,7 @@ static PyObject *__Pyx_CyFunction_descr_get(PyObject *func, PyObject *obj, PyObj
+ 
+     if (obj == Py_None)
+         obj = NULL;
++#endif
+     return __Pyx_PyMethod_New(func, obj, type);
+ }
+ 
diff --git a/dev-python/decoratortools/Manifest b/dev-python/decoratortools/Manifest
deleted file mode 100644
index 7a8cdab0eab9..000000000000
--- a/dev-python/decoratortools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST DecoratorTools-1.8.zip 29566 BLAKE2B 878abdcee14f4b7a99554655dc3b5003ba49911893230dee51da54f38e78582cbfc6f0a53b7a19aae1abb85474dd6c85b824ac69f60add756c5a36c2563755a8 SHA512 b107b61d76c1c41ebe4f663d42fff3ecf184364fa46c234a8ad9df0d626bdd113c7527c6e1d97fc2d38c0fc76ff43dbe0190fc1297240c44d9ba490b11f6fa51
-EBUILD decoratortools-1.8-r1.ebuild 814 BLAKE2B 1bd2b11325876d1c76e68bda6631c5ca441e5cd7eef6aacb1bc22923a8b364a52aa36f2214cb93f946f2ab0d47543225f9a1e07af8aa6467fecfe1098ec049ec SHA512 cb25b8f35d6220620c72063338ca4b40735b8d0c6368f632ae34e13bddbda5809ee5a0f29da70dfa52f92fde50e98c21f5e786b2e9491cd5874cd6509541e346
-MISC metadata.xml 466 BLAKE2B b2b0af402ccbb86a0436ad4cfc74374ca20fa836e83de31c786a6c90c3da0dd30604aafec9057930098d2c6a033f77a7c1e46a62b6c697b9d528f51bfa4d52f5 SHA512 23576433c2f58bd0f01a2946c4a619140b4903528145ae767c66bcf387e2203dcffd534bd56650d80ade21fd6b213e5261cafaf6036ad4a0845f183db0eebff8
diff --git a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
deleted file mode 100644
index 91487d35a326..000000000000
--- a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="DecoratorTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Class, function, and metaclass decorators"
-HOMEPAGE="https://pypi.org/project/DecoratorTools/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="|| ( PSF-2 ZPL )"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests broken with named tuples.
-	sed -e "s/additional_tests/_&/" -i test_decorators.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/decoratortools/metadata.xml b/dev-python/decoratortools/metadata.xml
deleted file mode 100644
index 2d2780528722..000000000000
--- a/dev-python/decoratortools/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>
-	<longdescription lang="en">Use class and function decorators - even in Python 2.3 - now with source debugging for generated code.</longdescription>
-	<upstream>
-		<remote-id type="pypi">DecoratorTools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index 5345ca6d9a93..356c50913e8a 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,4 +1,4 @@
 DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4-r1.ebuild 470 BLAKE2B 7a505f05254156f34716fb2c9f815d5af3684c1269b7c1c486131808544890f4af9199256e0e5ce55d68b1126888a111cbd118a05b0641e8bd50e1e7ed882253 SHA512 31de5906fe2669deb7df872af39c364165f51c272fb224af351c03f1a44f9e5c1b8d90cb54c7834f1b9e1824368a1ebd7204eee71a06e03cebb604a1e2bdb7a4
+EBUILD dicttoxml-1.7.4-r1.ebuild 469 BLAKE2B 81a5bc436f897dda153e22a8671935e81d712963865c8cb665dfbd4fdbcba0572c709d7062a9f8a4517f975a6ffaf04b9caf59d27e9dd481c55e1eee1ff2277e SHA512 55fe0c86ccca18136623525f69740701829a5db5c053ee6815612a769de86bfdf6b95a7c3650ce30a7e9606663b433e8d6e8a65339cfef43028a797352315e4d
 EBUILD dicttoxml-1.7.4.ebuild 441 BLAKE2B 8717b909f3c47beb41cf55c3a9b19831ffe8d146dbe5739a3eb9bb4d6446ebc8761c7c34f78552f8a48df54877f32556918734b18c3beed398e6620c0fe1c850 SHA512 cf65855d5773a41931f58d41a10cee6c2d8d8c2cd1d3d2f793ac9185b67ba04610175e88ebd4b389e009960f29844697d61cbfd39ccda9bef1f0abf3e62d66e0
 MISC metadata.xml 503 BLAKE2B 6669e69ea7d5afa8edb064e78652a4b035f19dd786aa8eb531ed2cbdc4274a884330e7159b9a3ed051a28a0be531237bc88fe893961e5b59fec738a6d902a0c9 SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
index cd25c58130e1..5544ba09be89 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-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
 
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 3e91224b717a..9c789ffdd72a 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,3 +1,5 @@
 DIST dill-0.3.1.1.tar.gz 151986 BLAKE2B 71b364730805974117cb00965a2276aa240b6265f2a98ae8e70ca2f9d8bf7a4b801fac083f2395932fdc016de3f068fb46091f296910ce96725bc982e774a40a SHA512 e61610451972522316d7ed6bc8287e38521fcd2e6736b43200ae498f24596994caec92313be1da71cf1b536fbbe01505673fc8018bfcbaf7705147a294565ab9
+DIST dill-0.3.2.gh.tar.gz 148972 BLAKE2B a807350a2d2bb84e705d20c9c60d47834b41863b862a5d347ebc32273c1b9479c568cd3018126adb1cd052bb00f50e8424f7118b37524329458150b9a3e59e3d SHA512 74a0c01dd7c0126c7de21a3b3660e51486fec17f64f23b8e7f23b70243209908573fef8851f6eda53868e89ef1a8a5e351a3ef81dd9cb3e122a2dba33a86bbe1
 EBUILD dill-0.3.1.1.ebuild 572 BLAKE2B e6567ad2af1b6b54898b81d0f0cd3bd8e82f6ac176d768252a02a9d7eb9c0069e1df24f91657aef873bb279f51e89c5853eebf428414ea9690b8b5eed9479f66 SHA512 310c104e8b0ebd763d9651f7e43879cdc7ee56bc33bea0ffae024512fb108e9ff08e26ea27e2413c12ba2331f26ed5ce10ed8baab6d4cb2f36665822a99bdbd7
+EBUILD dill-0.3.2.ebuild 633 BLAKE2B a459f682842124d3e1f78ce80b24353e71e4594779b8e86ed6f6cc8a23d00b6ae2071b15dabc078be5db8a8a528cb4006b0740193c51e7aa0cb59b4b6a45afa7 SHA512 1c325c302396875f42cb488267ce4ac3903d8d75b60d155fa99173a5d07f0a7a7a9cdde0724830a6fb4db49fc8d7d6177ab7dd1d36401d8d19a66adc2b6c54e6
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.3.2.ebuild b/dev-python/dill/dill-0.3.2.ebuild
new file mode 100644
index 000000000000..32554341e099
--- /dev/null
+++ b/dev-python/dill/dill-0.3.2.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
+
+DESCRIPTION="Serialize all of python (almost)"
+HOMEPAGE="https://pypi.org/project/dill/"
+SRC_URI="
+	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	local fail= t
+	for t in tests/test_*.py; do
+		ebegin "\t${t}"
+		"${EPYTHON}" "${t}"
+		eend || fail=1
+	done
+
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 2bc8c05b73ca..192cefddbf45 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,5 +1,7 @@
 DIST django-otp-0.9.0.gh.tar.gz 60204 BLAKE2B c71b27e007580410fea3cf8110631801c8c08f7e325c3586cb5a41a9618b371b5d65e3b030a5b483cb6cda684fe837cd40aa1c5d04f54dc82cda750b8ba8aeb9 SHA512 dd3c99e928ebf1ba5b6f6b2f34fcf8a1f86ad64ece17a9bd97c56be239f165808f6d1025e2826a12a8eadc150fe49920a0b7ef398d83542cd97a4a6f391505fe
 DIST django-otp-0.9.1.gh.tar.gz 60230 BLAKE2B 1a912e35f8245d3411fc1a9b26dd53d99df5dba5f2a5f68003bc4d535365af336d8664f81cc42f140247bb0e7150c0a60a3308d96cda1e41681dc93520f112d2 SHA512 600286653c035527a2a7978f19c3b9683805ab4562f12afcc2140adf92705239b8f9141b9979a6c30110cf7f3cc13c67019f39448d3cb8db61c4e1b0cdbcee88
+DIST django-otp-0.9.2.gh.tar.gz 61366 BLAKE2B 5016e352db2cfd60d94cd38986185fddab84bf997b72ff5ec3b59cc5944afa74ef67deca7691fd78e28f2aa75bccb9b976707ab6822a6781e541157d4810d8cb SHA512 9634ab23d006d768cec8f3a6685a77e54f8bee89854af2d431eb99560819139518738eb9f1a124190633dbd99f47388f5fa9685bd199a0918f73b263894ea051
 EBUILD django-otp-0.9.0.ebuild 765 BLAKE2B ece769006ba4a4f8ead9ee89cd15224526bf8f21ece4155b84f05fea4dad1009da5225571c2b5171fbea013153c844ce8c22c36cfc738171739d2777d5d3ea6e SHA512 8b151507dc42dbc5d82be55ba8290bdede0703b49fc4d03109a4264362d04e9f3fddd9a60212fecb5906ebec9f75359e01038363db045389508e151b1b4861f5
 EBUILD django-otp-0.9.1.ebuild 802 BLAKE2B 72eb8645f292fc55bb581e512cdfb51171b1a449e2767c717bf303906bab2bb7b71c11cc86b7227c19a55f0da45b6dbd897e1cfcf74649b4713b429f0fec7dbf SHA512 7b36b987c0c6f0144458b0b9d98cababde280f6fd0f4f04483decad56a1260444fce91c20b654e9e9987e7d88e2e375ba18b6ddac3ba43b2f218883e8a1d9074
+EBUILD django-otp-0.9.2.ebuild 839 BLAKE2B 450434a0df280094bb855c2bc6109b9080a95f36e76ce1d881acabfa72c65bc261e35daba69262c33a9c4482dcd79f5c2b0a2fefe8ef2615524ac2e69f40411d SHA512 822577452adcead3039eef453c11060c679dc22063a2f51f5326dfbcd105dfb621dbf63a5fc4ba3a42f137e34b63298fe3ffb029e22a152a1e6c6ab086beb8bb
 MISC metadata.xml 386 BLAKE2B 089280b44d70d41d6ac97b035d5346c7e484d53cb5cc4505a1953d46c2a618140fbc1a3094a14ef18d3c39023ae10b7d162977537b646563459f3a9912e765fe SHA512 6d181b8eaad8df98a615d06c292284c1f8fe28e6bbfbd467428fc387fb9553221646d2014a10c3d16a4613db7d6f0af75714dacacecf1daad0db053d08deb3e1
diff --git a/dev-python/django-otp/django-otp-0.9.2.ebuild b/dev-python/django-otp/django-otp-0.9.2.ebuild
new file mode 100644
index 000000000000..b14eef63539e
--- /dev/null
+++ b/dev-python/django-otp/django-otp-0.9.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 9d54b02b6c5f..619d2fecf751 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -9,5 +9,5 @@ EBUILD django-2.2.11.ebuild 2304 BLAKE2B 9c7961c57036af4e8e3878275033b0afb905b0a
 EBUILD django-2.2.12.ebuild 2319 BLAKE2B bbb771c0f705b919c27691bac19ec789cae02e247d5e6ad38d008fbdaeab3cbb04880838967b70ff75b28e3cd40c6f4a3fc8d89e6833f70883846d9393277761 SHA512 bf4087b350b4b5341102e9f3adcc0af00c1f21464d3d744a7c0fbd51b13c88c3720f61fde56a8f55819f981c623ba0a0fa70eb5a910105b6b7f864d88762b199
 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
+EBUILD django-3.0.7.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-3.0.7.ebuild b/dev-python/django/django-3.0.7.ebuild
index 68d6de70d162..fbc688b75cbc 100644
--- a/dev-python/django/django-3.0.7.ebuild
+++ b/dev-python/django/django-3.0.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 eutils
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 0c30a4e4a582..2c28a3b8c03f 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,7 @@
 DIST elementpath-1.4.4.tar.gz 119577 BLAKE2B 65724afc715dcdb4903779933559e85c833cc262cecf2f53a86fd58e542717dc26137270bde13b5bdfcd81bb768a2dd74d7ed7213ad4292c0a1a2a4771855370 SHA512 39ce9f8e8f0a75690d5ccf5faa7e28113f971015c2baeec8b8f443b568c71154589d36dc2c5a3965eeb1d3d4257f65090cf44078747c7711bc7fc8c9ad051d43
 DIST elementpath-1.4.5.tar.gz 120091 BLAKE2B c9ac74c4b76b3a3204364532831563c5600bdc159cfe5e853852c08de0c7abbaec952304120da4f13b14d2239880c9c1612ae8db3535cf4ad1d8ea8498cc3f1a SHA512 be3908056af67f892696edd31d1c836bbd7083a96eca1217d2dc972c5fc3bc583d89b825bed3fedeebd775d5fca53dd9b9a918ff9a3238bba54efe8ac0a51e21
+DIST elementpath-1.4.6.tar.gz 121815 BLAKE2B 09014fc503c8a3a6a6865572fa48c515af19fc009512369d8e761ca5b4e516de1add7eb14c0681114331c4a8ef08cccb5fac8f4ce2b436523780cb4e41e2dc00 SHA512 ac1d7fc0ab07f22fa02550ac77f4067b5564f78619bf98d6fda257751d6404684622580002d69beb769fc471500ee0c08f6095b05ddc6b7d81276dc8e158c40b
 EBUILD elementpath-1.4.4.ebuild 693 BLAKE2B a5c69a7d2c34beef1c29d2d5394c5db94ec27ff6d44712813ad0cbf363ff4eb1da1e2665842d6fc829704adadc64071447b8942e29aaa524f64d9f8faf979c24 SHA512 b55d339102ba114133a7f0157037391e50f3dc3efa50563d064b95b0fbd82f347baa0cd5c064f61d96b3bb18321932084f2fb6c45d6bf7b18fd41ccda043d04c
 EBUILD elementpath-1.4.5.ebuild 662 BLAKE2B 4886298b0fb7e2c2ce2fd3d4b83aaff47fca63e8d540b713ffa8dbdc2a92abb386b852777fa86d48ce0a4630239e39af86ad7e64d6e453f090aa1020c89dfcf7 SHA512 a319805964a6bc9ae55dd8b2ae6378a7c1eed9a398d4ab328cabd30f0cbf2faee54b38076afe1c9e7d6e68efa54efc43ba81410a3b5a12a9f7ffcb33a1e7d819
+EBUILD elementpath-1.4.6.ebuild 666 BLAKE2B 819a17e4093e50dadd9e6d08aae99de55dd1c9bcf16fa45b390f7a062fa311221a62dda144f013201355747854747d25cb8c14059226f5849557d623bb85931c SHA512 6d7eaf90b255fb1af831f4ad7fbc785b92d2597e45cbc16a5d408fad509c6ce876e99834c62dafe4141899e533f42a1f839079e3ac4086f26371a235975654c4
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.4.6.ebuild b/dev-python/elementpath/elementpath-1.4.6.ebuild
new file mode 100644
index 000000000000..053e351ab6de
--- /dev/null
+++ b/dev-python/elementpath/elementpath-1.4.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+	https://pypi.org/project/elementpath/"
+SRC_URI="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 )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/extremes/Manifest b/dev-python/extremes/Manifest
deleted file mode 100644
index 375f067b6385..000000000000
--- a/dev-python/extremes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST extremes-1.1.1.zip 10360 BLAKE2B cd7967dd044ceaea4aec009986c226afac964adbcb1ac750730b4554920d081d220bc91b1800661ed3e482d7769f0cab4986d7d59fb94e6e7ac52b20cdc6111b SHA512 a0b951306e9d5ef84c6498268a3476e7ed889f0be950a529774e2d8c4f155d4c10cbacd20864ed37aea5512ba65a267e414eb2b4f7cc6d67b21a020d82da8ec2
-EBUILD extremes-1.1.1.ebuild 659 BLAKE2B 11efec54e9b042a1654dfd6d70e270b191050555b364ab63d3d32f2736d8cff2c8c00678a891b99df9a6f740d1ad9a3f593cb1df6eec92980a25aee83d2441da SHA512 9408b2df7bb24dc7bc9159326bfc9f998c9f43cca89da032d9dd27fc7f45b259a6bbceba25f01e257fb25c7772c26d70331c10a72461afdfeb6c6746ab8468d9
-MISC metadata.xml 321 BLAKE2B 5f2e15aeef9cdf66ed913af7c0b1c3e04ebefc387cd088b5dfd9016b19fbc0db70c61d3931ddd2a645c72a6919b658adfed1058220c114754f656aef49e6eeae SHA512 b24c67841c1fcb26d1e5d13d113dc9d862a86c99603f4544fb486885b9637e5bca3dd945e82cbb35a00f327ceea5f91039b306b53c37e1dacec435d4cd510364
diff --git a/dev-python/extremes/extremes-1.1.1.ebuild b/dev-python/extremes/extremes-1.1.1.ebuild
deleted file mode 100644
index 709f62525b98..000000000000
--- a/dev-python/extremes/extremes-1.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Extremes"
-DESCRIPTION="Production-quality 'Min' and 'Max' objects"
-HOMEPAGE="https://pypi.org/project/Extremes/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="ZPL"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_test() {
-	"${PYTHON}" peak/util/extremes.py && einfo "Tests passed under ${EPYTHON}" \
-		|| die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/extremes/metadata.xml b/dev-python/extremes/metadata.xml
deleted file mode 100644
index 4a6ed43e944a..000000000000
--- a/dev-python/extremes/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">Extremes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 4a93dba0144d..81d37131dd23 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 843 BLAKE2B 76ce809c56cebead2d713c0a3d56bdbc67d47d86048d3c13e858cebaf25c9a7215c6c5ff26205c32442f044d1c49e5404c2c968a80f12d7d43dc9b317ee8dbe6 SHA512 f3ec8b083e43088b38a7b2849a5fd86ecb49f15812faefeb818a8c794810804609cfbdc9feb31d3c5617dfffbb97f7a3ad34f0ea3030d1c6b7afd91caedf52c4
+EBUILD fields-5.0.0-r2.ebuild 867 BLAKE2B 6f937bb0ab5262a5965b4578a158ac9fee2ec2e92fd589b0f41399691506b357406c062906e6517eb4f1a3fbef4d8f69fdb4ba7e0cfb77b306b6161c1e00b691 SHA512 790572cb0b49b75dd30f27910272b08f3552e93af1bd37438803b4c31e5e770328576f0f1f77700c7f330ac3ef4431c1409c71748acf969ce10f1cf16c7df740
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index fa18aa3b9fb0..1e6194144158 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,9 +15,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="test"
 
-DEPEND="test? (
+BDEPEND="
+	test? (
 		dev-python/attrs[${PYTHON_USEDEP}]
 		dev-python/characteristic[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/flexx/Manifest b/dev-python/flexx/Manifest
deleted file mode 100644
index 6e6c815e1ecf..000000000000
--- a/dev-python/flexx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flexx-0.4.1.tar.gz 287596 BLAKE2B 768100f6ed38ea7639e79c23a74a2ba38c41e4450920be4c331c159fed92ee8fd143de28c33ac7eb2625717c2fd53b90571a0a9064b36e5c9be4883d6e71468d SHA512 af9d84876d2c6b5f8b9fe7967dc282e4043456606c1574c10cfcd15a3f3d0d3f8f889a41ff254655eed06200b5d9c10fa27249343ee689ff62346031a4ed607b
-EBUILD flexx-0.4.1.ebuild 632 BLAKE2B bc068ecc73fe7a691cf393fa39d87e2da484c120263dbd9df17dfab7176b8bab5d8ba324471190fa43b24ee0e008cf6eb044fbaa138abf4a629158b978777acb SHA512 29f3deae9a3d5cdd1a968c210e4f70069815cebd8628da2476197db6ef968cc31e978199e0a745bd351b839611c6bde90f8ca4179e3613540b54462362d6cb2b
-MISC metadata.xml 509 BLAKE2B cae737d6d72895541b62c3aad8301bda5b44314fd46df14237061cfd260a57f524d803b7054927834b00316d1add8e28be4fdc05adcc6142a68986944e263ccc SHA512 5e15dab8c10def713dacd1e6883502c075aff68e72b839d89273d28b3edc7ad03cc82152e1f4fddbd416b08fb0efdda3df26832c99bab7cddf700caba0258492
diff --git a/dev-python/flexx/flexx-0.4.1.ebuild b/dev-python/flexx/flexx-0.4.1.ebuild
deleted file mode 100644
index c79c0bc52329..000000000000
--- a/dev-python/flexx/flexx-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +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="Pure Python toolkit for creating GUI's using web technology"
-HOMEPAGE="
-	https://flexx.readthedocs.org
-	https://github.com/zoofio/flexx
-	https://pypi.org/project/flexx/"
-SRC_URI="https://github.com/zoofIO//${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-#IUSE="doc test" broken tests
-IUSE=""
-RDEPEND="www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flexx/metadata.xml b/dev-python/flexx/metadata.xml
deleted file mode 100644
index a79517c51568..000000000000
--- a/dev-python/flexx/metadata.xml
+++ /dev/null
@@ -1,16 +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">flexx</remote-id>
-    <remote-id type="github">zoofIO/flexx</remote-id>    
-    <maintainer status="unknown">
-      <email>almar.klein@gmail.com</email>
-      <name>Flexx contributors</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
new file mode 100644
index 000000000000..40de290d92f3
--- /dev/null
+++ b/dev-python/fsspec/Manifest
@@ -0,0 +1,3 @@
+DIST filesystem_spec-0.7.4.tar.gz 222128 BLAKE2B b111b8194e2c31065a26dcd952aaadf0bc39bf75e94b10f79a387dc1b66838de820bcdcd90af60533dbbd33cfcc275470ccd82b98d0c82154f0633efab355187 SHA512 086e7e7905ff4a55b7027d2b005fd875200bf40469ea4b36effb9805a3416145ba4c709c4a6c8a3ac24a033cbd2104e7ebe401e2610db6c2d8548a63587b343a
+EBUILD fsspec-0.7.4.ebuild 766 BLAKE2B cb64ccc8dbc50654c200cb836164c8478b0aecec2abba01532c8bb87b09aa5788ea5a0d239b64f2216e283afa95fc5117804d88ddf9c794f3408e417a7e1146c SHA512 49fc6b4e0b728ee781a6156e10306e32d45b2a9bc4bde4a4608624e0f78d2bee29bd2a79448bfb2eb8b482a4fae8a26dbda28c9cb0b0c262d5756d7f94c2a76c
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/fsspec/fsspec-0.7.4.ebuild b/dev-python/fsspec/fsspec-0.7.4.ebuild
new file mode 100644
index 000000000000..b3b8bc1fa87c
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.7.4.ebuild
@@ -0,0 +1,33 @@
+# 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=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? ( dev-vcs/git )"
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/peak-rules/metadata.xml b/dev-python/fsspec/metadata.xml
index 7f4f33c6dbc9..266e3f19ca59 100644
--- a/dev-python/peak-rules/metadata.xml
+++ b/dev-python/fsspec/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 58fcc65b1c78..f8059bb90537 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,8 +1,4 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
-DIST httplib2-0.13.0.tar.gz 219494 BLAKE2B 5bb46582b9962266c9b431be7d323720f780075d6c60527e29c45415a001fc671b4bac95912f023e198250013a3b5a2442c02fa3284abba19bb3828bbc96ddb6 SHA512 b447531f18eb7d288cce9b1ab4b59c4302bd8db8eb095a102f9d730cb49644a1dc531ca007bb9c9a7321c9876ec0ce953317561fc94a51b02bcb749d2de1fa83
-DIST httplib2-0.17.0.tar.gz 220694 BLAKE2B 9e9a3c0e3fa13dfc2b58331ba1b52f77ebb8642126994125595c344e19c2e0a430ca556a213938f5f9da1aea69f1cc30e1c89ccf2c64c2389641973f89aa8f4e SHA512 8724e5784990e7315762e5f8333197d6f6820aa6cc66aebbeb981ccedb57e35fa998e623d7e0cd8fcb18178895bc73b16bdf015c90d2adf208d6d5320f3551bb
 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 1389 BLAKE2B 0ce0d890c9ead002e91d39fc14c4706a5f933b3025fc775d32033655b537dcb66a6d5f408609dd59797ee2eefbdbbc5d57004c12af85978bec65463ec54d4240 SHA512 74cf81885d8993291cc403d56b3ae36ad0e44907dabbb2541aa9605cf96f5d78cc60ac5bcc40206ca073b1af987a21899fdbdd2bb79c772f6d960845683cd165
 MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
diff --git a/dev-python/httplib2/httplib2-0.13.0.ebuild b/dev-python/httplib2/httplib2-0.13.0.ebuild
deleted file mode 100644
index dde741a044dc..000000000000
--- a/dev-python/httplib2/httplib2-0.13.0.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=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="app-misc/ca-certificates"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/httplib2/httplib2-0.17.0.ebuild b/dev-python/httplib2/httplib2-0.17.0.ebuild
deleted file mode 100644
index d11a844dc7d8..000000000000
--- a/dev-python/httplib2/httplib2-0.17.0.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=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
-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=""
-
-DEPEND=""
-RDEPEND="app-misc/ca-certificates"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 75b1f79af00a..44a9f17e507c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -6,6 +6,7 @@ DIST hypothesis-python-5.15.0.tar.gz 9010730 BLAKE2B 926433af6c57ee5206bc50ba962
 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
+DIST hypothesis-python-5.16.2.tar.gz 9011495 BLAKE2B ecac1ddd0c214a06e8822fc04f9fd9378933b1c3721c1a3aabfa605d45df21b22b76a497f5fa1bef3009ceba52d582c9f69a0918fdcaf7df7b3c03405f8eb7a9 SHA512 91feb7b81c4c36468b05318c0db7ce3b607374b55bf2609bb587d316448f087fab44b99cde1cb5fc440df8d31ef2dd6c154281f13dd7bc6d1de4e463cdabf66a
 EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
 EBUILD hypothesis-4.57.1.ebuild 1835 BLAKE2B e78e8aad70d73ab036ec275cfe0a59c7ba38eafabf3e6a8273fc3a0ec88a8ae60f685d302963eea9e4e5d00c8e4b5ca05f3b5fbaeee3c822979eed460a7e0f83 SHA512 4d3ac5f3919ffac5cb5dbd134d939d71493b2fb9e8414b43185336e78a4d4a62f74c829efa512e32440ac4892e2857611f5dd1d076dd8469a477fc132e0d5834
 EBUILD hypothesis-5.11.0.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
@@ -14,4 +15,5 @@ EBUILD hypothesis-5.15.0.ebuild 1593 BLAKE2B 4f3aeb8b3378416bd0d41f817253ecdf304
 EBUILD hypothesis-5.15.1.ebuild 1595 BLAKE2B 6fbaf4b3a84adbfc6eb1251ba1df555904e0bed0013df52891d3d2d9f99e97d01e3f6352ea931d30aa6f5cf340ff82a338fda1e12fd94dca22263559ac077c29 SHA512 b603470e4d701a878bf316e6678a93d32ada16ca5fa39860f3a3f3a7cb5b12e9862580a80cf30380933d03ff9a2df7711013c9a4831f5d2572df5423b6beeb72
 EBUILD hypothesis-5.16.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.16.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.16.2.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-5.16.2.ebuild b/dev-python/hypothesis/hypothesis-5.16.2.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.16.2.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/icalendar/Manifest b/dev-python/icalendar/Manifest
index a455d7e30c89..500f40bb8b18 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1,5 @@
 DIST icalendar-4.0.3.tar.gz 77899 BLAKE2B d4043914b85359a8309dd7c8acce55ec5921508319342f2ffb2e16017aa5aa164ef7fdd44aee7820a971516a3e157b5c8ee86732e669c8eac4b5c4bc1767e334 SHA512 2f0ac5a7f36c7d37047ba20bec3f2ca7df51a9e3ec3f29751c71cdd264c01f7e0abd6efc298dac5a7c87911cb4916e56bf77716d6ca05a2d090e26486e6a56be
+DIST icalendar-4.0.6.tar.gz 78418 BLAKE2B 4941262cca63cae4df249b6ec01b73b640caa002d011ed19aead89fdfc6fe9a7e37258d95668142137faf635403986a2ea4d3e39dd565d1205dfb238fd13e98f SHA512 e8f7ee878cc14b75636268d7b8c79569ce1875142fb907b1eb74bc6b9cf96f218e4be63828190aa2a27978c431437c1d454febe9a2da58c5f2785e283ae725b2
 EBUILD icalendar-4.0.3.ebuild 1128 BLAKE2B d03477b5ff950c8e4269d1b2afc4ff6deb3bda4ec97446f9c6c1240f3b37f16a94f94c4f0b7ea5b14b517b18a6bb1381713865125e3043b3b7b4d8c0223858ab SHA512 9fc3ee32ec7521e15b2fa0481cef0eb45b54088c3ef18a50f1f3de005fd9f61b09f358fa6062c284b37eb1557bbb3171efb59887c15950f8d1393cfd9da00ed5
+EBUILD icalendar-4.0.6.ebuild 818 BLAKE2B a309fa950247ca9095e91d24a28fd5778b8b6c2e4790a2b5fcc732ed1b64c372a7a5d3a0287e37c2c9a561628d0baaddb9ea8348c40c053e2d8d1b4f2e5d158a SHA512 c5abca0b72f30895f044b56930c91a15504c8e1ff9558d1916432658dc39ea8436a246e668e902b5f0ddb33553bde2488accadce6d6ec4e2ba29f6d43d026a4d
 MISC metadata.xml 477 BLAKE2B ba3e50265304565f743e67aab83f0c5457a0db7a104ab8a0d7a85f5d610e49b61a3314e4f037c73e4dff469adcb66ea6c0de6a0027c3fb487637edcd74e1f84d SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22
diff --git a/dev-python/icalendar/icalendar-4.0.6.ebuild b/dev-python/icalendar/icalendar-4.0.6.ebuild
new file mode 100644
index 000000000000..4b472fff1bc1
--- /dev/null
+++ b/dev-python/icalendar/icalendar-4.0.6.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,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 6b5bd4ed20cb..54472f17492b 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,5 @@
 DIST immutables-0.11.tar.gz 76589 BLAKE2B 64d7ac89dfe680d1fe78704c165a1fbb15559203980f1a8edd65fbd74589bf2038c799037189849a917555a67483e0cb352664b1d44f3ce161db6c88b878ae5a SHA512 fceb1feb5fd8de4444681cb89c6692206042d0f8f404d78848c379ca3afbb07425e2ba875f7b7cdb42bf126ea0b9f682c0b873c4867c5266cc77da28d29f6ab5
-EBUILD immutables-0.11.ebuild 468 BLAKE2B 5bd912a30a0c5790e31ec75fb043a175e03f4fe56069a83f2b9d9aa93f81ea2180d42c26f3bca69b518679bcc27c9a1537d5c83316d608a4aae5a3e9f555f78c SHA512 f40c4f61403120cacae1d55f0ccb62a937352c46cabe7d75a3054dfbeac3e7a2ba65dcfa2c53ff673e0d2dcce973fad683772f52037cac93130b1794d989a26b
+DIST immutables-0.14.tar.gz 79451 BLAKE2B b18b554536a92b6f23e4c8366161cd43c2bd75d81fc619bfc9760b265835c7fc729c797758f195bd50f81573c4c52d48449deabf19167321eabbbfdfd8961217 SHA512 244a1faab70d46333749abcc2a98f65802c656eb58b23353893a8d894aff4089ccf9ed43170aa0094d8ec2d59a0dc7014d8bf12ad1a044fc066b43ae968968ea
+EBUILD immutables-0.11.ebuild 467 BLAKE2B cf218d188b5c9d1e76dad9daa9bf759c6c9921d760887f55ec93a2856c10d48373b658b92e8689d36c10bd8541f87429bdceaa682b08dd3b61a3a03374b6127a SHA512 ca127c9316d6a453a0c1af6d8105e3ab5b809430d45b54d8e2f609f4940484d9d97e520583bb1799b7ba5431d8cf97d5bc31f60d417c5b4c2715eb440b5c7627
+EBUILD immutables-0.14.ebuild 469 BLAKE2B 90480cdabcbd810147a2a237fe65c1a89888a6b5bc184dd7c144f198427b4dc5d02fca6353fddf00ea12c7d722f9784f0dec56c286074357aa0ae8cb852fbb4b SHA512 be0dd6a91063da1a0a8d2b0e4c9d505b802cac39d2f5a30753581e51526082f26630467a7a1be6248060bec8541892c8ba1aacbd8f3b6c1da23b56e2aed8e009
 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 17e029c35a1d..d2ef63b48f12 100644
--- a/dev-python/immutables/immutables-0.11.ebuild
+++ b/dev-python/immutables/immutables-0.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="A high-performance immutable mapping type for Python"
diff --git a/dev-python/immutables/immutables-0.14.ebuild b/dev-python/immutables/immutables-0.14.ebuild
new file mode 100644
index 000000000000..ce13a1de3ff4
--- /dev/null
+++ b/dev-python/immutables/immutables-0.14.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2019-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 high-performance immutable mapping type for Python"
+HOMEPAGE="https://github.com/MagicStack/immutables"
+SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/importing/Manifest b/dev-python/importing/Manifest
deleted file mode 100644
index 7159a3c1a139..000000000000
--- a/dev-python/importing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST importing-1.10.zip 17138 BLAKE2B 3f8dbfc469c6c2a0499f06dbfc79cc83e078ced4a5bd03fd79b4f641eea23be83f8796eb4784e39fceb76673a1a40be1c8504d5ae28947f6daf7d57b76eb7b44 SHA512 628f4c119c8d0cf558580887fe30683223dcc439ca7ad5f7fa442d87452f3aa7b2f8ad200634c70a969dfdef7ef5938fd51fd36044d311296a8df73b5f2851cc
-EBUILD importing-1.10.ebuild 551 BLAKE2B 1bb666fafa1f376b394905dd98dabec62a688bc545bff45ce124d905d611c8441ab5599e4a47e9b35c9a2e1ab01ae488e9f424b3c20d77fd473ba6d53aa65e21 SHA512 70114ac74c8c2bcda6ab00223c3625b16ad23b1a986f0b9d7d8b3b851d125a48ac27e3ac9e8045e9c39dfa0c1ac72172a18b7c0f5e96011fd936f9ba160abbca
-MISC metadata.xml 322 BLAKE2B d389bcf311ea8df62879cd98a9f0e7c09d8a7abfc5366a69c15837bef254c7c17605e89d528b0e917524ab81fc183c7e2de41b66822049f051ed25302282c946 SHA512 d5d569d1e9f867a47f2f22ab678ce9013b576a3ee8ad7b12fd43b1d5842a38e00824bb9b84af37e34eda21a86ea67ce4cbc06dfb6487f78d68fa080ff78bb2eb
diff --git a/dev-python/importing/importing-1.10.ebuild b/dev-python/importing/importing-1.10.ebuild
deleted file mode 100644
index 23d055e58748..000000000000
--- a/dev-python/importing/importing-1.10.ebuild
+++ /dev/null
@@ -1,24 +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
-
-MY_PN="Importing"
-
-DESCRIPTION="Import objects dynamically, lazily, "weakly", and more"
-HOMEPAGE=" http://peak.telecommunity.com/DevCenter/Importing"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="ZPL"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
diff --git a/dev-python/importing/metadata.xml b/dev-python/importing/metadata.xml
deleted file mode 100644
index 4ebe2a7762aa..000000000000
--- a/dev-python/importing/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">Importing</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 33dcbce45c5c..7662fc51ba3f 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,5 @@
-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
+DIST importlib_resources-2.0.1.tar.gz 26060 BLAKE2B 739cd7fd90cc12b5b586eb1bf3386b85cde2399e80cfe05cae5173ba5177fb1d15f7e44e7f78473ef03e37d563861f57b7c470782d1aab161eae4c40d530ca29 SHA512 7f62c5bb5650dd2689a41ddef2e9131f01d5edc99b284a7a4257fce18190f2e78c38a2c260d6fe5e6db122666435e079c417bd9011e68e35724932854c90a1bd
 EBUILD importlib_resources-1.5.0-r1.ebuild 1280 BLAKE2B 16db4dff815fc1e5dd034965e42a9d22f0f7413281856c80aa7652003799c2cdb928a8a6143a5d1d3d31b7f1dddb7ae933afe3bcf30a6d838ddaa290593b5cac SHA512 3c4c2aead9af6c6f44acde1b976bd8a853993ef1813cadff7986d41f4b627f697817e65d0ec2bdee8d6fcf3b618c3b320a3b179d8df9c4445dcc1c31d21aa837
+EBUILD importlib_resources-2.0.1.ebuild 1289 BLAKE2B 199f43187b4b4dcbe438fd6d1d59dbef10712cfa389cccb3285e1589c82bfab2acc1ab2f48e0436c6e2b577a55a55287cbc6d1f0141ae166c9594756c0ce2f53 SHA512 c917897a69f256365a8ff767b810c5383ed023853d1ca914483c301729a403071efeac1e3918af71fd927ac58caf8426f7ea443cb4fd9912cef5dbc9bfd44d22
 MISC metadata.xml 895 BLAKE2B fadc4adcee6471eb31d5a1b406c9a6a29e366a50abcee105a08456b432e9a42352afdf7d08f37c3ee6100f1f57080bce2a32770b3fda96bedebfa7958957975f SHA512 6802c03cfc8049146dbbef1ff6462cb2eb01f18048a857ff0050af8e15367bff8e40521c989fcdc68c95b2025d2b7af09015f99c279ee504d556165687d7fa36
diff --git a/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild b/dev-python/importlib_resources/importlib_resources-2.0.1.ebuild
index 6bf25d466e98..e86acf448e78 100644
--- a/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-2.0.1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-# This is a backport of Python 3.7's importlib.resources
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 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="~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/ioflo/Manifest b/dev-python/ioflo/Manifest
index d2c641c516ea..11e141b4c16b 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -2,5 +2,5 @@ AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e
 DIST ioflo-1.7.5.tar.gz 838342 BLAKE2B 2eff6af7586400ff562999679b861079184757c951e006d2f300ec894dd17fa9c2ed975781109f6d3bd2cabf0e038ccf81d9f9aeac742313eedaabb59b5a1c82 SHA512 886767d72c4067727d47652fba157a76ecd8a6a5478a761feb3923992ffc585addfe892027ade104c5d44a56fd1645c0548ce3b554553f58e1104864c359470b
 DIST ioflo-2.0.0.tar.gz 838200 BLAKE2B 876a38df5e6fb953eef6e65bb793fa975a4fed8d4f698029e26747a4887a449bcf5cc5c9fcce081f9b93faeb34d0f783b2f81e17ec619d7ca95810762eae810d SHA512 b4b70aef65cffe067d7563682a2cbeac0a07cd4722aa2de8fb56fd127c99df771dc5d3d22be24aadd628a26fd1b7407db684ea7257b45eba8f8376f4ad226a87
 EBUILD ioflo-1.7.5.ebuild 591 BLAKE2B 66c9cb51ca143e4523ab28135f4955229aa973539ff4344df2f44a7ae322d12ada44d39920f6344beacca06e03449054ab397906f89ad9feb48b50281124b6ca SHA512 5ed720bf859961c1a6492a67f08f4556dadf2ed5dd7bdb4fb9aa24493deefbf26d944370ffd4be63b394bd5bab3abb3e4141df920ce23cf81adc44b4f79a9494
-EBUILD ioflo-2.0.0.ebuild 716 BLAKE2B a0e150ce01279ddb1cf6cda12d9cf6f42c99d38d53066dbf49c70cc3c11dc6e02e3e86a7c928ba3e3282bb7f4c0b7d9ba1a6f46ee9848c5a08f925243940a737 SHA512 bc958b335da1015b59573c64d075a80f8c4d1cd047fa62a38f15d85f7217856c778ccc1418c3c1f0268746de10d7373379c639fb739af52386c8cc905579bea1
+EBUILD ioflo-2.0.0.ebuild 715 BLAKE2B b72173e3f103bf4511392924bbae46d594799e73454c4f997c74a6bbaf33d1fa86a254d7d4d5f512a92d4e8a521e761faabf1e07359920e1d692b3f7a29a09a4 SHA512 b50ab250cddf468e81f5dbd62d78a8a23c36e4fd863ad813a027084b7bbc4871fce17382f0b3cd0268d09e9fa918cbd59e84612aedf1efe8dd62f4ddc3103942
 MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
diff --git a/dev-python/ioflo/ioflo-2.0.0.ebuild b/dev-python/ioflo/ioflo-2.0.0.ebuild
index 72f4c33e57af..8b3ad91cbfc3 100644
--- a/dev-python/ioflo/ioflo-2.0.0.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-lang/python-3.7.4' python3_7)
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 7f5ea844f625..28bf7ea6af22 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,3 +1,3 @@
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.6.0-r1.ebuild 738 BLAKE2B 8046b91b1ca8ba18421ab94d53dd25c7c9ec2a3fb2029933a741314f4473765188b493e3dd7e68bdade7ad014868edbba89552f2b3e55469c00b7a02ac72d78e SHA512 f6d0b5858a09d49026b2704124fe5aac8c01351aef80482699d69d1b8cdf77d309ba8b331eaa1242f09bb2cba904326a8f4a810755741129b0cb11d27068e62c
+EBUILD isodate-0.6.0-r1.ebuild 693 BLAKE2B eb53a911115221abc4a4b0603342210e7826b4cd070923de051f3eaf27757a24c455b3cbf3def0dbe657a7185a202f4335c5285db1a2a7701891bc8ff1ce70ef SHA512 84ca40a536a6ad378a96cfd91ca5c53be8dab0bfe77e4045dc30485fd20e761b8dbcdbb1ec8261c7825f31f06e29e265af88f950ff1d976c654a38a4d1f979cb
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.6.0-r1.ebuild b/dev-python/isodate/isodate-0.6.0-r1.ebuild
index 299513adc188..a3724d35406f 100644
--- a/dev-python/isodate/isodate-0.6.0-r1.ebuild
+++ b/dev-python/isodate/isodate-0.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( ${RDEPEND} )"
 
 python_test() {
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 22f35fbf37a1..85e75ec06f38 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 1622 BLAKE2B 53335e56667657a14c2f710d43b2fb8aa9e78e26c328cee8c7519991fbf53c112310426ecb5ce2735a28f661a2091f57cc6610d8d7bb4f3e33837120fd95be34 SHA512 1800f5dacff1ceb6be9702834ccc10030498069e2568fe9df3ccb6662136fc44b14e2ccf1e6b89c91268c354210b45283b824dff12b76ac9dc6c16e3aeca2ad2
-MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
+EBUILD jaraco-collections-3.0.0.ebuild 1621 BLAKE2B 0d3173f46195a12ed52f8765f55f174c85f0ea87d5e15a2e46b2cc9393eede22ba34cf4bcc43a9359cecdffbac87ac235b8ea836eea62c2df8a9d095618ac6e0 SHA512 d34f6d25d23c607a0bd4910ee238a67d829dd4154bc3abf1a7d51bd85a4e6c4e6fa91ba412506d90c614a763777f7285d470739e5820f7b276b0fcd9bd76db51
+MISC metadata.xml 659 BLAKE2B 93e69bff80e5efb51d41b24817d5aba23bf2a6cc6c45a81bd4b0fb43ae5da538f377ebc0441b14f3fdedbda8b3a7932defa5255087fec9cdf6ac4d35f86dfd1f SHA512 1609b6fb022a1880fde31a5e9c7096e373a3c5da4f8a7b2e256241bfdaa591d4247b259a7b5dfcb6c9ee06182c3b899eec468992b50a04eb3f1e1fba43f20b20
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 daf0e55cc4e1..fcddc6e1249e 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-collections/metadata.xml b/dev-python/jaraco-collections/metadata.xml
index daf35c2a6e48..c5e5153c8dbd 100644
--- a/dev-python/jaraco-collections/metadata.xml
+++ b/dev-python/jaraco-collections/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.collections</remote-id>
 		<remote-id type="github">jaraco/jaraco.collections</remote-id>
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index dd0aaacaa57d..818abc9278a7 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 1499 BLAKE2B d813da4cb3d6ab0b43008af4b545a31e7ec0c06b0fc376ade2e099fb5c7799c93950a66faa1debd46bca16a60fc49ac61537a0e7af0e460ed3daa826347c66a5 SHA512 1b6a457356edb9bedfbf4a006b52513ed768ede02fc9367d67520ae53e61f8cc731dfe80a8e2d13054545d87cb950f1ba4c27590c980dad67dda4c9be9bb8647
-MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
+EBUILD jaraco-text-3.2.0.ebuild 1498 BLAKE2B 87a0a81e619affa289ae89debf0cbb425c9afd92d753956e85127b4e5a6d611047289812182abfc51e32f5f213aebdccca706f700fcdfd47d66c65278f43de34 SHA512 fc2c3aa08a09fd8a216daa02f383ea5ea9e31f9c86702c1a19ab0ea6985a57fcd10e0c324a8ac11da6afde70e0ea39e230ad6e6b155d24565e7d25903643ae78
+MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
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 7787ea07b500..2c978bef2db2 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.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/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index 97eb016b7480..e1433b293fac 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/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.text</remote-id>
 		<remote-id type="github">jaraco/jaraco.text</remote-id>
diff --git a/dev-python/jaxml/Manifest b/dev-python/jaxml/Manifest
deleted file mode 100644
index f357d20c469a..000000000000
--- a/dev-python/jaxml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jaxml-3.02.tar.gz 27718 BLAKE2B 283f07fb9e09a4141dc9e45d143e920153e587f6e521f3ac4ab7c85afd09ef29b0db412cac46caadd990937f656b304a0b66a3570e797c3dad78ef4e4ff0c4d6 SHA512 e23b4026dfb7b7d08cfa7ebdda11b66ad7dfd5a158495d90d73988e9b9d5ccb898cc7df112a78c6f3724dd04a0fdef24129e3c115b230e56b184acd28f844597
-EBUILD jaxml-3.02-r1.ebuild 525 BLAKE2B bb4141826af7e165755a933658dd112de7d9b837af9a39918ec102431390a6e0fad3d293dca74eeea7102b27d66ba039782a11a169aabaae36a3a5a5c4d34f24 SHA512 9ebd558be14225764e9d3ff1e29bb25a1280598b558eb6cb9a86ed240aee65237ecbc03518f72d480601fbeba4ae44b1b46c105872cf2d93532c9953a3def641
-MISC metadata.xml 308 BLAKE2B 10e688e394496791f717f83f29fa62bc1f2f644d59661b7265388021e415418bc272b2718d57996c2a437b714b7e146dafde2520bd3391a3500652c0f7f7b3f6 SHA512 9ad2ffee9add34959b829a18859f17d43b4ad4c09914eb8bf6ede1d38e383c279f8482be74415dcebdbf1f1e444b1a5a4aa5e7734bfc066d061612502a8a775b
diff --git a/dev-python/jaxml/jaxml-3.02-r1.ebuild b/dev-python/jaxml/jaxml-3.02-r1.ebuild
deleted file mode 100644
index eed8b80583e5..000000000000
--- a/dev-python/jaxml/jaxml-3.02-r1.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="XML generator written in Python"
-HOMEPAGE="http://www.librelogiciel.com/software/jaxml/action_Presentation https://pypi.org/project/jaxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 7b835144a9f8..d36d7576f01c 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,10 +1,13 @@
 AUX jedi-0.17.0-tests.patch 957 BLAKE2B 1ee6b50291131f7acf2a2a35e575c83b22ad08bb38ff7879724f28a4c46290c04b86ef4135ffc8a0363edca0d988fcc58d33faeabbb4a522a33eb3fccb9d4362 SHA512 fe0e4a4cfdecbc029c04e87509ba55c00aabc39f3ed16521d5bc1a5b576c273848a9bc13e9af503d104fa42b6dd45ec533e922c9246eca8c9fee666f290ac9dc
+DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
 DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
 DIST jedi-0.15.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e
 DIST jedi-0.17.0.tar.gz 462810 BLAKE2B 71eeb3e3fa23786c577fbcb3727a49111d6188c2a5d9e13538123c7c6817b67d457f3bb88423dc9dac6ee09dec89d7281c86166bc771fa0215cd327a4432ebd7 SHA512 562ae25f0c4709cfe36fe4e737d383190d8ad435b3ff580b9fbe966544c8d035cfa29815459ceecfafd704547560a8dc397f841989043e6e18c8f9d639f75399
+DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
 DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
 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 2128 BLAKE2B a5e1e2889bce86068fbe7407bed098d32c89ff735ff1498f78692aa430e66a5cd633379dbceb5baaeac3daf9fe0a31330f5b1142402fc1328801be3b5a3ac669 SHA512 6489b4bf7ae68fda13a3062e183a0a3063a1225ba914a8107c4371362fa1ef04b08ae2b967f927a03ac29024b2edc37c9957183dc10fab7c72923af575915b3f
+EBUILD jedi-0.17.1.ebuild 2128 BLAKE2B 60c917667bc22722fceef83013626559f4d82ae11e47b5617195b68fd7fc693769a2d340c79ec9bbf24885c6e530091aeb5ac39238a6652e898277f602b1de3f SHA512 b3e17e5a1d984bee6aad5bc1727b71d03011cfaf82f5fb6e6974d512a7d399ef266b14791d6b0b0bb71e5e1c2df127a0d3f50b498325b2bab0148e3050f7ce18
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.17.1.ebuild b/dev-python/jedi/jedi-0.17.1.ebuild
new file mode 100644
index 000000000000..00e52e0a5408
--- /dev/null
+++ b/dev-python/jedi/jedi-0.17.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
+
+TYPESHED_P="typeshed-jedi_v0.16.0"
+DJANGO_STUBS_P="django-stubs-v1.5.0"
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi"
+SRC_URI="
+	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
+		-> ${TYPESHED_P}.tar.gz
+	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
+		-> ${DJANGO_STUBS_P/v/}.tar.gz"
+
+LICENSE="MIT
+	test? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# upstream includes these as submodules ...
+	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
+	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
+		"${S}/jedi/third_party/django-stubs" || die
+	mv "${WORKDIR}/${TYPESHED_P}" \
+		"${S}/jedi/third_party/typeshed" || die
+
+	# don't run doctests, don't depend on colorama
+	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
+	sed -i "s: --doctest-modules::" pytest.ini || die
+
+	# speed tests are fragile
+	rm test/test_speed.py || die
+
+	# test_complete_expanduser relies on $HOME not being empty
+	touch "${HOME}"/somefile || die
+
+	# TODO: investigate
+	sed -e 's:test_local_import:_&:' \
+		-i test/test_utils.py || die
+	sed -e '/with sqlite3\.connect/,+2d' \
+		-i test/completion/stdlib.py || die
+	rm test/completion/django.py || die
+
+	# tests relying on pristine virtualenv
+	# this relies on test* not matching anything else
+	sed -e "/#\? \['test'\]/,+1d" \
+		-i test/completion/on_import.py || die
+	# this one's broken by 'path' module (dev-python/path-py)
+	sed -e 's:test_os_issues:_&:' \
+		-i test/test_inference/test_imports.py || die
+	sed -e 's:test_venv_and_pths:_&:' \
+		-i test/test_inference/test_sys_path.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index b363c704b00c..732d71f5a034 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,5 +1,5 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
 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
+EBUILD jmespath-0.10.0.ebuild 550 BLAKE2B a21409d5eaf91c3228d361b8ff454157affc1850b3b8de665baf055f5daa1a3ee42ea15997f6b3e41084b8e3565349c42b7cdcc0d3fceb7ba02a33e1c57b93e6 SHA512 41c73c709bc9d28d61753a777fb5f26bfc7c3eac6debafead141150c59085616b36ddfaa278db999d5f8449e4e86d61faefa705e8fdd636af9b34c4dd0e445ee
+EBUILD jmespath-0.9.3-r1.ebuild 459 BLAKE2B 99f79b965fa04a54c6728eebddf6773db39f27fb8ff511a6f4514e4085a829640428245170791f1e26fbe12809aa0818d2c506ae97b7e19381a2420126f5cc0f SHA512 2524a64f620cf2e4e8b56d06032304fd39b52358177e235c512f1a99627b639002a1fb81f7e6d240d27a91225812d9b0f7147124f06356ac9dee2c1bed4d4515
+MISC metadata.xml 383 BLAKE2B 499175b2782977a9f367d29b3e185c6e3981f40fc9ee0498c62a986ac8f96151d26f5d66af5091dd16f67ffffff2f713ad5194441afe5962e3dc1f9bb39fe3d5 SHA512 94e829e583c07a6b21e8b25c95e9eaefc697c3b1cb8d1b8d61b745369d0977c8040ea2aef4c72e826d0cda9156b023ef60e8db808f526a65a971e4c1161bbab7
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
index c0b40b306c50..70889dcee2b9 100644
--- a/dev-python/jmespath/jmespath-0.10.0.ebuild
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_P=jmespath.py-${PV}
 DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/jmespath/jmespath.py/
+HOMEPAGE="https://github.com/jmespath/jmespath.py
 	https://pypi.org/project/jmespath/"
 SRC_URI="
 	https://github.com/jmespath/jmespath.py/archive/${PV}.tar.gz
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
index 750aa2040e94..bb8ec31e1837 100644
--- a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/boto/jmespath https://pypi.org/project/jmespath/"
+HOMEPAGE="https://github.com/jmespath/jmespath.py https://pypi.org/project/jmespath/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/jmespath/metadata.xml b/dev-python/jmespath/metadata.xml
index 500ee1453701..1742868cb146 100644
--- a/dev-python/jmespath/metadata.xml
+++ b/dev-python/jmespath/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">jmespath</remote-id>
-    <remote-id type="github">boto/jmespath</remote-id>
+    <remote-id type="github">jmespath/jmespath.py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index e00683eefecc..51828d8721e1 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,6 @@
 DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
+DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
 EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
+EBUILD joblib-0.15.1-r1.ebuild 1401 BLAKE2B 38061dba3e69d17564285ce0dbbc3d5e53970d72bd17c533b420b94855bff7bfcafd5d213afee5fb2147c3a55bc8bfe5a5f52296dddfd639643e3b59c064ffe9 SHA512 e013c2196cd674f7280d8426a4be47e3b9bb57b669696f4ecf7fbea0cb2f8071c0ff1b34380ed4da3a188b673959bb05bc00b990fb4b1c60576bf393259dcce3
+EBUILD joblib-0.15.1.ebuild 1150 BLAKE2B f1c0c586328977f4953818ec205ee4d4702fc2118f64a6c60dc248d1ecf115e6b2207764243805262a998616648b4014791d467d443d5769118ab6da9a6ab889 SHA512 051ee65d697022daf61083db84c88666c3f43bdb8c2572b6440ae5d59336f32b5447f7636beddc6487f87e8592f79bed06f90f790d39ae95e8860dfdcb2f0b51
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.15.1-r1.ebuild b/dev-python/joblib/joblib-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..094bc98ec490
--- /dev/null
+++ b/dev-python/joblib/joblib-0.15.1-r1.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="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/loky[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	'dev-python/numpy' \
+	'dev-python/matplotlib' \
+	'dev-python/pillow' \
+	'dev-python/sphinx-gallery' \
+	'dev-python/numpydoc' \
+	'dev-python/pandas' \
+	'dev-python/lz4' \
+	'dev-python/distributed'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unbundle
+	rm -r joblib/externals || die
+	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
+	find -name '*.py' -exec \
+		sed -e 's:\(joblib\)\?\.externals\.::' \
+			-e 's:from \.externals ::' \
+			-i {} + || die
+
+	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
+		-i doc/conf.py || die
+
+	# tries to fetch from the internet
+	rm examples/compressors_comparison.py \
+		examples/parallel/distributed_backend_simple.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/joblib/joblib-0.15.1.ebuild b/dev-python/joblib/joblib-0.15.1.ebuild
new file mode 100644
index 000000000000..a9d0d5360f06
--- /dev/null
+++ b/dev-python/joblib/joblib-0.15.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,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	'dev-python/numpy' \
+	'dev-python/matplotlib' \
+	'dev-python/pillow' \
+	'dev-python/sphinx-gallery' \
+	'dev-python/numpydoc' \
+	'dev-python/pandas' \
+	'dev-python/lz4' \
+	'dev-python/distributed'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
+		-i doc/conf.py || die
+
+	# tries to fetch from the internet
+	rm examples/compressors_comparison.py \
+		examples/parallel/distributed_backend_simple.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 2bdf13f5949d..fd11c1211efb 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpatch-1.25.tar.gz 24340 BLAKE2B 0022b4b0b3a0487958b86f14c1738a32593b8056510e3836e15385874b64f5d243d757c99a146a48da6563f0d9330eb38cb91ad6cde3e0a1b4cb8cbd3b15f9dd SHA512 5e1d5b6dcb6ee847ddd561400fe2d00e07aa1827a63ab98a38cd5e91fa0e52d8635eba1192edbccf9c7b9ce9c7ce0a414d580665c427c87a820e533d26092ad6
-EBUILD jsonpatch-1.25.ebuild 838 BLAKE2B fa2a72b4138052873043b50039aec310c1ac78d9658ce0d4c2266b24427c0c6a908695d30eb1632d702d5c5ccba3270aab216f242dd05a8ac88c94b3ece066ac SHA512 43b9e2f0d341d6438418c11d9ce7e3b54859973495f0706424f936d8ea39fbbdc254ded111c2bb354fe0b237490015d0da67ee8f99c1705a46ee975eda325abb
+EBUILD jsonpatch-1.25.ebuild 837 BLAKE2B 38a9af2ea62b2ddb74540111d27b533a83f539a05a5621a453f776788d42d68ea060d13447e1b5029e61d6f4fab23b0a19c3f24cf5f1702561a9c8343ef603e0 SHA512 57a33a8c7470bf63d0569af01c796b19dfb076a2e8d09d58da57e9c93b6588690a15aa0780d008636b7bc5f4d488bbb92a7ffc9e41ec66a37a6308cdaf4bd88a
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.25.ebuild b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
index 29d72258211d..a78accbc67f4 100644
--- a/dev-python/jsonpatch/jsonpatch-1.25.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.25.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
 
@@ -15,12 +15,12 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? ( ${RDEPEND} )
 "
-RESTRICT="!test? ( test )"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index cf517f12d99e..84ef378e56ff 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 862 BLAKE2B 439cd695e924bd002d7d5d2c31c63b6244389191f6f3d013880d100ece76bddf58d5dcf4040ca1d86e21983f589bef8a09a6f342c09ab5a80bfb76147fba132e SHA512 77125596a8d3268768ec0700b6e99dbd52ea3d90192cd783644d2743065be916a601a879ff29abae7539ad06aa49012f169e0934ada0cd1d7ea22bc8f4710511
+EBUILD keystoneauth-4.0.0.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
 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 d60a54111e53..60b0dac745a6 100644
--- a/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kid/Manifest b/dev-python/kid/Manifest
deleted file mode 100644
index bcf9509a1d97..000000000000
--- a/dev-python/kid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kid-0.9.6.tar.gz 268602 BLAKE2B 8b0b6c1f290814c25865ee5dce624a2a1d53de0923ec10eb919e23d79bd603c8f2a1eef4d57dccf997783f721670d32dede4963b7073f571e279ae15e28d49f0 SHA512 56f87f5fdb9d692ced4b19c13705ee872058279084f49efd2e2515c28240e36833c7dfbecf084f504d6fef45f2cc60185decf0c9f18517d255ba469486aa3ae8
-EBUILD kid-0.9.6-r1.ebuild 968 BLAKE2B 5a059e327ee03c6f160c84ee252dcd9c54034b0fdc6298040d1871e374b751a5e15e08817614bf7ac997572d824697026412ed01e59258da10c95b7944d2055c SHA512 f0d5f3dd13904836a12672dbb888ff2c442015e5691bb19de5814e1114833f6c2474d4b106f7fd51b773d89c0af8c974e29052c29bef70ca58a404c650a7009a
-MISC metadata.xml 448 BLAKE2B 2dcd656a57f5cc9314f17e8834d2292eaf6415676a29f123922315ff7158c7dea787704057978ac3c7d0583c9944dde9cb99cc468d5ffcd364509e7269fc67db SHA512 910e2d680b8507c745125ee1127a0632bc570b9055b074d7e96665faec48f66a9f82769e7ff9dcf62f092aeb843a3f3700d8a36413f2de4419dd92538d0aaaf2
diff --git a/dev-python/kid/kid-0.9.6-r1.ebuild b/dev-python/kid/kid-0.9.6-r1.ebuild
deleted file mode 100644
index e573163108ac..000000000000
--- a/dev-python/kid/kid-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,43 +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 simple and Pythonic XML template language"
-HOMEPAGE="http://www.kid-templating.org/ https://pypi.org/project/kid/"
-SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-DOCS=( README doc/{guide.txt,index.txt,notes.txt} )
-
-python_compile_all() {
-	use doc && emake -C doc
-}
-
-python_test() {
-	py.test -xl || die
-}
-
-python_install_all() {
-#	dobin bin/*
-
-	use doc && local HTML_DOCS=( doc/html/. )
-	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/kid/metadata.xml b/dev-python/kid/metadata.xml
deleted file mode 100644
index ab97a505e009..000000000000
--- a/dev-python/kid/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 type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<longdescription>
-Kid is a simple template language for XML based vocabularies written
-in Python. The syntax was inspired by a number of existing template
-languages, namely XSLT, TAL, and PHP.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index de026615f1fc..5244e450a0bf 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,5 @@
 DIST lazy-object-proxy-1.4.3.tar.gz 34888 BLAKE2B 43f64fcd6573d4a4cdc2208bcd882714cb21474e4274d53b955664b05525ed5d1305ed4121f6ee319aefb3ab7827bc9b2073d32dc4c67e969adb5367a16d4cc1 SHA512 c2c8ad8286776d61def222b394cab27647b7a1bf4b3915e169b65c6022cb26d5ef286f1041adfddaf8a78a2410c11424983b3580a019561eda5f2e4c3a88620f
+DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
 EBUILD lazy-object-proxy-1.4.3.ebuild 991 BLAKE2B acd6892546fa1a958b2985e06a1b4b68caaa6933a064f6dfa7fe05992a1f391a25179487cfcc1b3b32926c498495283051a6b25548f6c99c6a5bc923f4ef0bf5 SHA512 11284bb64221f0c476b26f53e017449c7457fe46a2e9f7e8d856ff0b1d366d2114cd4c3d3f5fab4f2fa1d664d4eeb091b694df4bedb0ef630add6be6b0846cc0
+EBUILD lazy-object-proxy-1.5.0.ebuild 945 BLAKE2B 1814f0a13cf57a1f1e607d7a3864a99464e7cbef81f04f732de5c2ad6261ca230c3da22df6d760584a998cab3847676b986ab51db529c1735b6fede61fb78b05 SHA512 8028494e20f567d82695b1fea2eaaaedda2fcd349170d029a337db2fc065ede3f6e74193758518a1d866d33dbaa22de8cc552bbbf645bca1611f35bd1b561e61
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
new file mode 100644
index 000000000000..763b4358bbf2
--- /dev/null
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -0,0 +1,38 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A fast and thorough lazy object proxy"
+HOMEPAGE="
+	https://github.com/ionelmc/python-lazy-object-proxy
+	https://pypi.org/project/lazy-object-proxy/
+	https://python-lazy-object-proxy.readthedocs.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# No need to benchmark
+	sed \
+		-e '/benchmark/s:test_:_&:g' \
+		-e '/pytest.mark.benchmark/d' \
+		-i tests/test_lazy_object_proxy.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -v -v --ignore=src || die "Fails for ${EPYTHON}"
+}
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index 86851640ddc5..1955f33dc419 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1,5 +1,3 @@
-DIST liblarch-2.1.0.tar.gz 26829 BLAKE2B 14bf85bb91d800e5ca0d8eb4da6c2d9b3979b4560280776c276cad9cbd026331768729e5b4ca9b4646c6b199566cfb5a42b5148ef089e0ae5ec7e45d09090ba5 SHA512 fd6a6c48142e434f49fb49d9dee874b88f013775c280dd2dc929ed5fff4df7bd3743bf915b09dac4329f894cac24e466d78366a072136de389725bc5ed985ec1
-DIST liblarch-3.0.tar.gz 55785 BLAKE2B 1d69882b8748e7b3a1b0af6ef66f5a32e04e3b742d10ba3971fc5c0f490ca692584d46a849cc2e6d3654ab577f7698619540b54f9a13a7b0d5079b34fee248f7 SHA512 bf50880402ae8b490c5d98b158c5123d00340d981b26a5dec4538f1f4a1008efd5cfe024251728f90f1ebaade4ee18601fa30432d64921c3986b53efc531c68a
-EBUILD liblarch-2.1.0.ebuild 626 BLAKE2B de6b3101ddc26980b7fd4ebad5f2b6ebcfa3787c141aa762d5f3d04eb4e3b7238eedc3a8db1a390ffd1513ced24cabf44d8aa4dc188b43e8188a9afbbe34adb5 SHA512 e137786e5f705db99a1de668ccb2bb99c215d3a348bd61e3d38597837a5642f57e44214016751da48fd88eae7bd863b2e8d4c9e52a4429b20b2f51ccdeb2d4cc
-EBUILD liblarch-3.0.ebuild 740 BLAKE2B a777bf021212e85eec452394c76c8e8a164af61d442e9f46dfd123b986b83783b4be1bb57a45335126d86d56d674ae2cf860c94dc73acdfe87b87303e6039259 SHA512 cd0b5ab20f247aabc7d580bd41957ea041cd1283d498548a2d1addd226bb6fe03222e92666ad7f82204d97579761675b85ae127eb171fc1df1e549554e0b49b0
+DIST liblarch-3.0.1.tar.gz 55564 BLAKE2B bb3b3b67f9a64403e1a57e9b47217aa1a9b066708d70e1387a8b864a81dbdc4202b6b75012365f9c93179bbfcc4304116a33ebd3bd892f24334e0c200ae94b56 SHA512 591854eae54f5e644882f8ba486434f85196115a3c06f249cf7b343bb0e029b78a818610881d9d656f6342748c956cf5a213a22843e95b2ed05246a8013ff8ca
+EBUILD liblarch-3.0.1.ebuild 740 BLAKE2B a777bf021212e85eec452394c76c8e8a164af61d442e9f46dfd123b986b83783b4be1bb57a45335126d86d56d674ae2cf860c94dc73acdfe87b87303e6039259 SHA512 cd0b5ab20f247aabc7d580bd41957ea041cd1283d498548a2d1addd226bb6fe03222e92666ad7f82204d97579761675b85ae127eb171fc1df1e549554e0b49b0
 MISC metadata.xml 804 BLAKE2B 6a21220336fefcd5a5fa629d326ab9d08a00d8cfcf6d2198013d2437c0f2eae98a9d49fff9001cce05be900ead10c8dcf28daaae6f37567738935b0951b1a7f3 SHA512 ef436ba3e8779289ba2630dfbd546a5df56728317d4f41a16a11b8795388bbe0d87218a9d954a13719856504990e1a2c63b9a9be1660e18161d137bfdbe8aba4
diff --git a/dev-python/liblarch/liblarch-2.1.0.ebuild b/dev-python/liblarch/liblarch-2.1.0.ebuild
deleted file mode 100644
index 2bba1e2d90f7..000000000000
--- a/dev-python/liblarch/liblarch-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +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="Library to handle directed acyclic graphs"
-HOMEPAGE="https://live.gnome.org/liblarch"
-SRC_URI="http://gtg.fritalk.com/publique/gtg.fritalk.com/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-# This is what should be run if tarball included testsuite
-#python_test() {
-#	${PYTHON} "${S}"/run-tests
-#}
diff --git a/dev-python/liblarch/liblarch-3.0.ebuild b/dev-python/liblarch/liblarch-3.0.1.ebuild
index e0cb347435d9..e0cb347435d9 100644
--- a/dev-python/liblarch/liblarch-3.0.ebuild
+++ b/dev-python/liblarch/liblarch-3.0.1.ebuild
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 95fdbf0dd385..a533cfe5d21b 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.0.ebuild 878 BLAKE2B 547175d48388b3f2cbf56a4d43e1407e3ffdc3bbc0114f526e5a8022232af42fa8ff53ea91536c28511ae8d301bf9768fca03bad7a55a288279c3b85a4e792d7 SHA512 a2c001ea7099368852f53c488f348c92308a25a069e77b14212c7319e70a39f7a9f7c59f90b865079b3fc35435ad3632bb199e8aced8601f8bd427d1bec44383
-EBUILD lit-10.0.1.9999.ebuild 848 BLAKE2B baf90e224f3b4465cf3d2fc51dbe16f47860cc6547263e98f1b36e90883c3a8b6b76208195acda03ba0ed0e795a9c571b33f606b5b9b625a3a94746f04858d7f SHA512 334e66f279aa07a82081530771bbf4e5de4f06540d6ff20dfc62b4b2ad65d573c786ff0490d8b0b9de5b184a53121e791e5d247e16cf3ad94c076fa22ca56ded
-EBUILD lit-10.0.1_rc1.ebuild 848 BLAKE2B baf90e224f3b4465cf3d2fc51dbe16f47860cc6547263e98f1b36e90883c3a8b6b76208195acda03ba0ed0e795a9c571b33f606b5b9b625a3a94746f04858d7f SHA512 334e66f279aa07a82081530771bbf4e5de4f06540d6ff20dfc62b4b2ad65d573c786ff0490d8b0b9de5b184a53121e791e5d247e16cf3ad94c076fa22ca56ded
-EBUILD lit-11.0.0.9999.ebuild 848 BLAKE2B baf90e224f3b4465cf3d2fc51dbe16f47860cc6547263e98f1b36e90883c3a8b6b76208195acda03ba0ed0e795a9c571b33f606b5b9b625a3a94746f04858d7f SHA512 334e66f279aa07a82081530771bbf4e5de4f06540d6ff20dfc62b4b2ad65d573c786ff0490d8b0b9de5b184a53121e791e5d247e16cf3ad94c076fa22ca56ded
+EBUILD lit-10.0.1.9999.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
+EBUILD lit-10.0.1_rc1.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
+EBUILD lit-11.0.0.9999.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
 EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
 EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.1.9999.ebuild b/dev-python/lit/lit-10.0.1.9999.ebuild
index 611b8345f354..c9394c7a1190 100644
--- a/dev-python/lit/lit-10.0.1.9999.ebuild
+++ b/dev-python/lit/lit-10.0.1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1 llvm.org multiprocessing
 
@@ -27,6 +27,11 @@ BDEPEND="
 
 # 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
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
diff --git a/dev-python/lit/lit-10.0.1_rc1.ebuild b/dev-python/lit/lit-10.0.1_rc1.ebuild
index 611b8345f354..c9394c7a1190 100644
--- a/dev-python/lit/lit-10.0.1_rc1.ebuild
+++ b/dev-python/lit/lit-10.0.1_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1 llvm.org multiprocessing
 
@@ -27,6 +27,11 @@ BDEPEND="
 
 # 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
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
diff --git a/dev-python/lit/lit-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.0.9999.ebuild
index 611b8345f354..c9394c7a1190 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1 llvm.org multiprocessing
 
@@ -27,6 +27,11 @@ BDEPEND="
 
 # 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
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 91cd4dfa2b9c..93e97e38f631 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -2,5 +2,5 @@ AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea7
 DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
 DIST llfuse-1.3.6.tar.bz2 361750 BLAKE2B 74387a6aeb28c3f49234a4f430c3f2aaeefa2057d69e681405d9588c63b3a6e4a6daa58b8996541825c73ff4dabc5607874c2d7885586d793a6436e3f680aec2 SHA512 d67e39daf65c92ebb5bf69abb0c5dc3a88460228b5ec5ee762a11fc909369562411297e8ff9f512ee1ef539d8abec765924be581703fb7e99963c6512cb1f0bd
 EBUILD llfuse-1.3.5.ebuild 912 BLAKE2B bdb568bf00c3c4f6ec5188ef0258930ae8f07e715a7683d70435238d5ecbbed06f838d02a7db13411546a794669dcde1d8e25179b0ed2f60f4858b12b9588957 SHA512 603f7a3c9abd584eb1469ecbb4356ba1bfbd30fde9c0fe28e23f37969df73865012601bfc6f019c666050dd8c6b2193b3075484d626b5edb66d2afcbe0069841
-EBUILD llfuse-1.3.6.ebuild 750 BLAKE2B bb8755b0443fde0b8f7ed3bf161bcdf103dc2028e3b6919bb6ebcf8d65b5bc01fb938cc770ea205a85bec0936fb9e5927e82b8b51c34028397b53d0d74e82816 SHA512 1e74732962896a26d85a76b4e4f4034a6ff8ee9e530d85478bcfd384cafe8a27b097f98ac421bf55583071c362c464792ec6e852c195f7faff543aac46531f81
+EBUILD llfuse-1.3.6.ebuild 757 BLAKE2B b2263e1f5cb66433d656f83895380d25e8ec5be0daf2f81658c0e69156cfeeae458a86840c9f040d55382142693ec6781ae2c6abbcb7a8b5ffec576b1575f4ea SHA512 44b17f34d0a2c1585b78e837f0557c751feaac0eb873100dd7932928f6e698a8e6f8379ba52228128dce6b4472f6888cb867bc6f73277794def1bae07ad4d0c7
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.3.6.ebuild b/dev-python/llfuse/llfuse-1.3.6.ebuild
index 1249f8ffda4b..4b56e688f41f 100644
--- a/dev-python/llfuse/llfuse-1.3.6.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
new file mode 100644
index 000000000000..19fc994594ed
--- /dev/null
+++ b/dev-python/loky/Manifest
@@ -0,0 +1,3 @@
+DIST loky-2.8.0.tar.gz 112383 BLAKE2B 5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12c0000d891067c936ca984404146890fb131f8c261e SHA512 15fbdb56994e08f643b7bd5aa68d193f74ab61ef1230df9e2101fb4602a201a050e3ecf08229fc4ad61e478c893e0b34b81371ef9596733baa0e3d008125cd11
+EBUILD loky-2.8.0.ebuild 723 BLAKE2B 6a571782db1aec24fb01656aa6a80cb5c5c2d2777961d4ceb7ba1acf93ca4ef35b7763904a8d95571fb9efc47d139ab5416a144ef22d29a35dec3d93e52f0067 SHA512 708b6eb4291c3c9bef862c0112d61ce7e65427c07c5769b9f6671d2d68fd59938fb7a11b606c044cbee1371d36937b17ef1ceb75417962f963c48e1e8258df1d
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/loky/loky-2.8.0.ebuild b/dev-python/loky/loky-2.8.0.ebuild
new file mode 100644
index 000000000000..ade277177dee
--- /dev/null
+++ b/dev-python/loky/loky-2.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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="Robust and reusable Executor for joblib"
+HOMEPAGE="https://github.com/joblib/loky"
+SRC_URI="
+	https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# docker, seriously?
+	sed -e 's:test_cpu_count_cfs_limit:_&:' \
+		-i tests/test_loky_module.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-urljr/metadata.xml b/dev-python/loky/metadata.xml
index 7dddf61089b2..266e3f19ca59 100644
--- a/dev-python/python-urljr/metadata.xml
+++ b/dev-python/loky/metadata.xml
@@ -3,7 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<longdescription>JanRain's URL Utilities</longdescription>
 </pkgmetadata>
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 963203abd3e7..50eb500119d3 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,7 +1,3 @@
-DIST markdown2-2.3.0.zip 145194 BLAKE2B ef6e5744b6d9c9c8de20ac2d17ea0fc13453dd6401ab0c8d6d258f6a19aec4e94cfdfef28cbef7ef4b4bf6133a0acb55a1d8a76a41ac621498117c39b1fc1a6e SHA512 48bf8e26b34c48c0c12fc0f110b09d3232ea3394db3325d50639adf5cefb603344ee97b116e09b574f7c7414ab4a8293ddc37ca6706e41baaa14e399fa467d5f
-DIST markdown2-2.3.8.tar.gz 86850 BLAKE2B e227139d4ac368095872b09bcaac78ad49c7ae43b63036563c3b80b2ff6a78c3d302d8a2c56b68a5ba1d01967ab1861f842986316bb6d0a6625cb21b644e46eb SHA512 76abbbb2fa5f6a4cc43f358812079a2561f45ba5c2aed1a1860256440f7c48ca5e766c00c2464b973ef0cbbff9db58bca4398dc15ef8b5d203a6565b226bd7cd
 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 638 BLAKE2B dc37eb35566e4c1657a06fe3ec698188bf27668a63bbd59fa829714a2d533eb9194107070932daef84439996add5ed3efbf6e0badb33d8da2ae8efad8799351c SHA512 4683b0218df4bdf3333a06f5c37763a7e422535c51f428d1aafb00d3fb1311d294e570bc8a26480872e0f27822038c162e226607f23d6a97e5873d80557a4d10
 MISC metadata.xml 641 BLAKE2B f1c0e61b9c9e1229be9dbc2d913af9398d8ed41dc69afa0d46dcbc3c74aa583eedea6e1c8132de436b10b288f76a9657e3c74f7e546d357bba817e38b01606f6 SHA512 ece3faf6646450ac53797ac77c91f7e7a9953dcc419f98738cb8529722d04fa00a9a0e9fbe0958c2119b6e0909fe1ca6eee50749a133e2aec8b2d242071348f7
diff --git a/dev-python/markdown2/markdown2-2.3.0.ebuild b/dev-python/markdown2/markdown2-2.3.0.ebuild
deleted file mode 100644
index 698a4cec1f4a..000000000000
--- a/dev-python/markdown2/markdown2-2.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Markdown language reimplementation"
-SRC_URI="mirror://pypi/m/markdown2/${P}.zip"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	# [issue52, knownfailure]
-	rm -f test/tm-cases/issue52* || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.3.8.ebuild b/dev-python/markdown2/markdown2-2.3.8.ebuild
deleted file mode 100644
index 34140e887c9c..000000000000
--- a/dev-python/markdown2/markdown2-2.3.8.ebuild
+++ /dev/null
@@ -1,30 +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 distutils-r1
-
-DESCRIPTION="Python Markdown language reimplementation"
-SRC_URI="mirror://pypi/m/markdown2/${P}.tar.gz"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 398f5f2332d1..cb162212b1b2 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -4,13 +4,16 @@ AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaa
 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
+AUX matplotlib-3.2.2-test.patch 16508 BLAKE2B 42ed1e5b59f3248dd0c8786769a9694e2e29dbde11d2bc8cff4dc6773663d7f777ee7e125ef9261ec10dd142b686396408d2e5a87939b74ed2c1f8c1ff0c7841 SHA512 e8689c978b7055f01ed7b996b6a25f716039c2bc146bc74cfeb8adb3e29739ddb5e0c5749b220ffb346ef95ad09dbed2339315e357c35d3a9b46d03c21a3382c
 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
+DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
 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
+EBUILD matplotlib-3.2.2.ebuild 6534 BLAKE2B 2b44325bbf66b1915654a045b0a1c539de9af2ac594b83b0fb2db139a59bf73d50f3e4fcfcf14e531821d4fd3b7e81d70bef94d13c7665c84e2231d097bed469 SHA512 b508b08c9843e6ffed20346363fbfb09bee7b88887160f9392dbcc12b3b4c8ad59232496cfec9a8f2b08fe0eba2f641317b34b04bf6be48fb376004aab7e0a95
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch b/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch
new file mode 100644
index 000000000000..13755eaa33e2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch
@@ -0,0 +1,419 @@
+From 7a65dfda781777872083623595c27dc1174b2ed7 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                        | 3 ++-
+ lib/mpl_toolkits/tests/test_axes_grid1.py                  | 2 +-
+ .../tests/test_axisartist_grid_helper_curvelinear.py       | 2 +-
+ 10 files changed, 18 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 75636301d..af057d598 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -3673,7 +3673,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 b5ca0ed5b..885afa5f8 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 ec693288e..8af6b69eb 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -15,7 +15,8 @@ if not mpl.checkdep_usetex(True):
+ @image_comparison(
+     baseline_images=['test_usetex'],
+     extensions=['pdf', 'png'],
+-    style="mpl20")
++    style="mpl20",
++    tol=21)
+ def test_usetex():
+     mpl.rcParams['text.usetex'] = True
+     fig = plt.figure()
+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 506611e80a4fd12b3f633583d20119fc2f096ba7 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.
+---
+ lib/matplotlib/tests/test_cycles.py | 141 ++++++++++------------------
+ 1 file changed, 51 insertions(+), 90 deletions(-)
+
+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-3.2.2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2.ebuild
new file mode 100644
index 000000000000..59b723084553
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.2.2.ebuild
@@ -0,0 +1,271 @@
+# 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='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
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
+
+# 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}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[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 pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.1.2-qhull.patch
+		"${FILESDIR}"/matplotlib-3.2.2-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
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	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() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index e00892e44933..c710eb4d3733 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,9 @@
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-7.0.0.tar.gz 70103 BLAKE2B fa7556019ad4c2e8905698c1295840176b763bf1b7356679eb3988112b962adfbdefa82e7ca7419d350b40186a3ec5015314cdd7229dee867bd03fba716165f5 SHA512 730add0e26d62abd2d5e49cb662d58db244a241e272e16d05c25c7bf2ebe8a2e28b2b2b5038082d5773358b50e05d5f9a93f88957dc1b13daf30686047f41bc5
 DIST more-itertools-8.3.0.tar.gz 86850 BLAKE2B 2438d235a3778237c0b9e1bcbf47847e1322dbe029dc15c47215b516d37948a51e60fe2198060768dcf527a54e5d17396a23d138cc00c55f811d20753cfd6178 SHA512 34e5489277477a2b8a51de3e28c3d010f06c9071ad98e58901734431d5640a6a03e4239cf405f75e4dd0838e5e3fe8910b64ad542759874c0f25725e4b9e78ed
+DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155cb5d6331a84607eba26842ee4e964f8f0a01d2c16d4c5446e5e51cc24aaea619105ae24b067b9fabe3fe8741de526dc SHA512 70bf72594cb92b165f1bdc5050bcd3d7d37eeee65db6c631b636222005f8d7707d0c6ab09a229e9f1a23fdcf2be948e96d0882f9fa033f29b7a472ec8441a4d0
 EBUILD more-itertools-5.0.0.ebuild 714 BLAKE2B 157f253d495410285f2c9c38f6487943eb2965ad1fc9fcb18ae4222f199b7db215995193f10b2d23163756a8ce5dc3600a7517cee2a2ffda69302faf204bf839 SHA512 75274ecf32e551be840489f74ba6d03c5c0cb3bbf85138282da5836b07f7b0555afad83d7640075e380cb90bef1db12327b44fd402a5b26c33ba085316b4c474
 EBUILD more-itertools-7.0.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
 EBUILD more-itertools-8.3.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
+EBUILD more-itertools-8.4.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
 MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/more-itertools-8.4.0.ebuild b/dev-python/more-itertools/more-itertools-8.4.0.ebuild
new file mode 100644
index 000000000000..b1c4f1688dec
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-8.4.0.ebuild
@@ -0,0 +1,24 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests unittest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 548346209740..8a9f0d07cd69 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,7 +1,8 @@
 AUX moto-1.3.14-newer-botocore.patch 2398 BLAKE2B ea5ebf10d926cca1e9e5a804317bb9b9e82ddbe14d25668f7d375c782b9868e16c11566a4b5de83c855001c2ab059c25566d2ebc32f614875f2b10ce39c3a40f SHA512 35602f3403f2e6e6ff33ffa3054d88ad84eec47731c22211eeaa45d12a7b9181e3710c15a820db060b4f3ad49e4d18e4433066755c649d09a5e82702f08b0f83
+AUX moto-1.3.14-py39.patch 1372 BLAKE2B 620592a897b8f2ddf1973fa3f00a7c2c2512d3da02bf7f5a1474e6f8a934815cdaf00951898af292ebc5b38a0cc961d685c59fd8dd952d5fbe64dcff086d9d19 SHA512 336d9c1d399d2969cc603a3070285ebd4cc2f58bd8fa8d477fd6bde8cfc9a9a873c15b98fd2814f8c3b1cf591826101c024658f5b4468f40e6beaa229c8c8f50
 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 2739 BLAKE2B 1321dc8d002c7e50b0165158613cb8867f5d248ef30ac6265566da73046725e989d2a5abed8077cabc349aa246e048b05e716443407e763873d119a97dc154ef SHA512 9729920041d55f8cb9aa1fd616a60139c151ff3a248798d3f83cfe191cdea2b9bb5226d017a3e5db6cbf9e2c5569df78d7c14c472fe3abefec184a23a317f309
+EBUILD moto-1.3.14-r1.ebuild 2776 BLAKE2B 1cea7381d46c92c8411e62717b1fad20465ac479cdb0c92c8d3b6b9bd16f838728097f92d2e62de079b61d1dd91b4728de03baabb08552817a7531636a565a94 SHA512 7838e1967746d2d41970dc649a6671d1d4420a51c259f4b8b65294f10c80b0ec453260a6e934b241175e348e680670e7aa2d2b4a23636f914c71927d9e805218
 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/files/moto-1.3.14-py39.patch b/dev-python/moto/files/moto-1.3.14-py39.patch
new file mode 100644
index 000000000000..de00028179fa
--- /dev/null
+++ b/dev-python/moto/files/moto-1.3.14-py39.patch
@@ -0,0 +1,38 @@
+From af66a281ee2bcc7cc6c48bb3c8d033d385c12875 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Jun 2020 12:31:00 +0200
+Subject: [PATCH] Fix use of base64.decodestring() in tests
+
+Use base64.decodebytes() instead of deprecated/removed .decodestring()
+in test_user_data_with_run_instance().  Fixes tests on py3.9.
+---
+ tests/test_ec2/test_instances.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py
+index 041bc8c8..1def1734 100644
+--- a/tests/test_ec2/test_instances.py
++++ b/tests/test_ec2/test_instances.py
+@@ -9,6 +9,7 @@ from nose.tools import assert_raises
+ import base64
+ import datetime
+ import ipaddress
++import sys
+ 
+ import six
+ import boto
+@@ -765,7 +766,10 @@ def test_user_data_with_run_instance():
+     instance_attribute = instance.get_attribute("userData")
+     instance_attribute.should.be.a(InstanceAttribute)
+     retrieved_user_data = instance_attribute.get("userData").encode("utf-8")
+-    decoded_user_data = base64.decodestring(retrieved_user_data)
++    if sys.version_info[0] == 2:
++        decoded_user_data = base64.decodestring(retrieved_user_data)
++    else:
++        decoded_user_data = base64.decodebytes(retrieved_user_data)
+     decoded_user_data.should.equal(b"some user data")
+ 
+ 
+-- 
+2.27.0
+
diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r1.ebuild
index e73600eb1550..71f3637af836 100644
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ b/dev-python/moto/moto-1.3.14-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=rdepend
 inherit distutils-r1
 
@@ -59,6 +59,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/moto-1.3.14-newer-botocore.patch"
 	"${FILESDIR}/moto-1.3.14-tests.patch"
+	"${FILESDIR}/moto-1.3.14-py39.patch"
 )
 
 distutils_enable_tests nose
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index b3fe78711eb5..4dda2af3923a 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,3 +1,5 @@
 DIST mysql-connector-python-8.0.19.tar.gz 12051609 BLAKE2B 252d4ee650c1eddbe54575451ac378236b6a795237c445239ecec096c7adcb60da2244592f083a50df57c9e2ae6447f1dcaf861042973a31c3fe7292509ef93d SHA512 9137b0b6aafbff16c83f59ab03da810232a92f6b76e38f460782153c5ddbdf6ae55d0c72a0c7902b7bc05ad1010bdc849662cd3d2138ae93476abf013e7a508f
+DIST mysql-connector-python-8.0.20.tar.gz 12058227 BLAKE2B ac16d0eb7ccc884e89bd493ce821b06223c7ea7a4c4ffce2ebc586c736524d826d92d3e3c7803c1f937c93a9f28df32205a04b3bd80474650e90bc267661879d SHA512 3b7298036f1b28eed98ca05ebc52619dbdf65393b4a01bf6eccea87d298da430ecfd19a3b327050ebc48b2c237698c7545c0196949d84cb79117f4d767d736aa
 EBUILD mysql-connector-python-8.0.19.ebuild 1526 BLAKE2B 54cb1d1096378a1e55112f6d7a59257263143a4ed20260dbdaf6fc16e91b99d5a17a134cdccb52f6736e6cfdb219ccd06025532322d1a217b48164e8a5df42c3 SHA512 697f961fc9e06388abeba2644fae2e6b5f5faf545ebf911535a2e7e0279bcf2b1ebc79c24507c6e498a7b61b1d666ff054efc3368bdf7231cdee8fbb3838aed9
+EBUILD mysql-connector-python-8.0.20.ebuild 1526 BLAKE2B 54cb1d1096378a1e55112f6d7a59257263143a4ed20260dbdaf6fc16e91b99d5a17a134cdccb52f6736e6cfdb219ccd06025532322d1a217b48164e8a5df42c3 SHA512 697f961fc9e06388abeba2644fae2e6b5f5faf545ebf911535a2e7e0279bcf2b1ebc79c24507c6e498a7b61b1d666ff054efc3368bdf7231cdee8fbb3838aed9
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.20.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.20.ebuild
new file mode 100644
index 000000000000..b6c5eebd14bc
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.20.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,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+
+BDEPEND=">=dev-libs/protobuf-3.6.1"
+
+RDEPEND="
+	>=dev-db/mysql-connector-c-8.0
+	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+# tests/mysqld.py does not like MariaDB version strings.
+# See the regex MySQLServerBase._get_version.
+DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
+
+# Tests currently fail.
+# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
+RESTRICT="test"
+
+DOCS=( README.txt CHANGES.txt README.rst )
+
+python_test() {
+	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
+}
+
+# Yeah, this is really broken, but the extension will only build this way during "install"
+python_install() {
+	distutils-r1_python_install \
+		--with-mysql-capi="${EPREFIX}/usr" \
+		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
+		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-protoc="${EPREFIX}/usr/bin/protoc"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index ec1d6a969c7a..9dec1b9c376d 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,3 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.4.6.ebuild 877 BLAKE2B 3269d4afb07d166639eab69f71047a66a8fc23e7853f1b5bcc4684a84f8339a4e9e42058f0b930ace0094c7a996759e93a1f76250d0bab230d8f54abd9db3519 SHA512 cc374218e0409b907042b6f83075e87bd1d7735ae2b4d1c8e9556ee36c81be904a565da84ebbce0ec9c37b954f29af3c922d7ddf74e785f23ad1582e887cfa77
+EBUILD mysqlclient-1.4.6.ebuild 882 BLAKE2B c447414c5caec67eea7ffdad207677ff39c151f2c837a2e1bef9a4a4f5fb668fed4f7c2473971f30f38c79953cb3ed9b3fd0d90058ebc74ad492cfd0e44c638e SHA512 ef39e9e0ebe1b93bcd159ccae949b3be989bd8b953d30a54415862e0888cefee976ee3ed835c1b5dcd4379635968be33582e75a62bd899b860fbd4f87911a3e9
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
index 8cb35e20b292..df0424f30bf5 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index acd56e06d98a..308c55181a2f 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 757 BLAKE2B e969f284ae2f744f87c8db5dfcb62fbfab9169d2602dab2e801e15a88719a615294bf2ceaa6023a6fffdeebf3909c5650c86607ede4cd3f9468de36fa46ee919 SHA512 a6515246df021849f94045b9c37f9db0e1f552cae30dc6381001cae8444b71a2a0085a3ee5dc6e85162421a6f0ba8ea4e7ef9e5a02f4b3051619f6fa122de8bf
+EBUILD namespace-repoze-1.ebuild 756 BLAKE2B 4fa679b01710a2f05bf05e6cd3c5be39c4dfb80c67441b035a2f6e5e3dbb1923264ffcae586d8e07429522c968111a4252e8c51abfb152285f6f6e268112c99c SHA512 309504e2e192d44f45500390119256449f3a862faefeb72d098fa894fb06936ec030ecb071ae7cf6361a6a9ecfd5dcd539e3690d0fbd85f180fca02aadc93e6e
 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 07eeacc23b6b..adf448164b3c 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for repoze"
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index f84fab810c8e..6f3d82f61806 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,7 +1,9 @@
 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
+DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5 SHA512 af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c
 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
+EBUILD nbsphinx-0.7.1.ebuild 634 BLAKE2B 251979e490381548e16ee34c9e024d3d227aef3ecd20298e1d50c304effc0f2d8a8278be26e073de83d3540d25d5905c111b3d7a64c825ef983d6fc4e58d9ed4 SHA512 97540ffa327827e25bd4c38aed7f9224df33b631b5c6b545a10bd510a28a8180a83e76dbfc102be8db203c45563b173760a3368a08f9972c7511a0b958827954
 MISC metadata.xml 809 BLAKE2B 2724ffcef846efed97ee16e7395b3362596c46347fda07bb418469f3e39f06e0523177e7a8bee35cab7113de6380a1b7ca34a6b8bd108e765796fe12d4fcc478 SHA512 03c63397c153886e8ab60767ae510a4d17350a5a2b18c05ddbcc453ef81581a029c3c63fd7c82b109dcbe9a142ec32af1650b240c72d8f95097be326c39a7080
diff --git a/dev-python/nbsphinx/nbsphinx-0.7.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.7.1.ebuild
new file mode 100644
index 000000000000..45662ca939f9
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.7.1.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/networkx/Manifest b/dev-python/networkx/Manifest
index ba46ae009770..6e4c6ef815f2 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,4 +1,6 @@
+AUX networkx-2.4-py38.patch 3170 BLAKE2B 33577a719e9f59f910b5f0284318d77a9dba2392c4a2a25a0539cb3770f8326363de7a24473cd6c7d74a96911f3b0c040056daccaff23bdfd05fc9aff76410e7 SHA512 6142474c21f3ab613256252bf688873f19a68f781690dfdee63325835a692182e10b241495b0948f4658aaf2b36ff1f051931036cb97254459974dd807cd1550
+AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64660c2a35d24ec4f405b5abb46fc4d971606ffaee0637d469673f1e55840629453c57d1e3c809d5e2b02c7a103 SHA512 3474cce5a89f3011bc8715c1ee6ca64c2251dae8ef142da24edb88c6b85d4ce1bc1cf72656674387b6a75132d25c4c348f1d32fc71674c789d3c06e9cb9dc5d6
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-2.4-r1.ebuild 1847 BLAKE2B d19c11f1147acfe62d894037b64ccd56d8bdcc017d1fc5de72bde73df2760d6cad27f57239857cd75fafe1ca3e8716cdfb4dc6491e36770768069982cf58403e SHA512 2d9af21619883a43b427c1f0492f60ecaa157b06d25249a7e2c1d061294c2713e7d3495962921cfc5fdd5bed8863d57a826a7382e4d269adbca10bfb3b9d6d5b
+EBUILD networkx-2.4-r1.ebuild 1510 BLAKE2B 7174aacd90741d927f8299e841a36f7ef4d7b6d9a1dfa54e2ba1ab4b96db725a8c9d1cc360b8fff3341711216d539981b149aaba5576b0efec6a4dbe6f29808d SHA512 f002f7407410cb07aa64e8c65485b268a9c58f5b52d70ff2313d788939dfdc705b7e755769ad49116899b3d9adb8f3e8853dba2419ac5e86452b4b4746076431
 EBUILD networkx-2.4.ebuild 1543 BLAKE2B b3cc53f08dad66b10636bb9082b43af06eb0828031b9327a1fd04bd329613effe35817af97f546b50ae0e194f73ed4ebea56af314e1311044395ff8c02546b15 SHA512 5c5a68c58eca8beb45568d6f4fe80bd1b58b6513cf3492654db7c4f5ca23d6192a9702793fd1aa62db48f3fc71b48a80dfdc5638c37e3c89d16fd3d1db2f3ef6
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/files/networkx-2.4-py38.patch b/dev-python/networkx/files/networkx-2.4-py38.patch
new file mode 100644
index 000000000000..9ce3003d1042
--- /dev/null
+++ b/dev-python/networkx/files/networkx-2.4-py38.patch
@@ -0,0 +1,84 @@
+From 488e824439124f4dd52f8230c452a3df681b1bab Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Fri, 15 Nov 2019 13:48:33 +1100
+Subject: [PATCH] Fix test_numpy_type to pass under Python 3.8
+
+readwrite.tests.test_gexf.TestGEXF.test_numpy_type failed under Python
+3.8 due to ordering of XML attributes, handle it as per f75dbe8. Also
+change travis to no longer allow failures under 3.8.
+
+Fixes #3720
+---
+ .travis.yml                           |  2 --
+ networkx/readwrite/tests/test_gexf.py | 51 ++++++++++++++++++++++++++-
+ 2 files changed, 50 insertions(+), 3 deletions(-)
+
+diff --git a/networkx/readwrite/tests/test_gexf.py b/networkx/readwrite/tests/test_gexf.py
+index afc40111ce..f16504c047 100644
+--- a/networkx/readwrite/tests/test_gexf.py
++++ b/networkx/readwrite/tests/test_gexf.py
+@@ -404,7 +404,8 @@ def test_numpy_type(self):
+         nx.set_node_attributes(G, {n: n for n in numpy.arange(4)}, 'number')
+         G[0][1]['edge-number'] = numpy.float64(1.1)
+ 
+-        expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\
++        if sys.version_info < (3, 8):
++            expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\
+ ="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd">
+   <meta lastmodifieddate="{}">
+@@ -449,6 +450,54 @@ def test_numpy_type(self):
+       <edge id="2" source="2" target="3" />
+     </edges>
+   </graph>
++</gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
++        else:
++            expected = """<gexf xmlns="http://www.gexf.net/1.2draft"\
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\
++="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd"\
++ version="1.2">
++  <meta lastmodifieddate="{}">
++    <creator>NetworkX {}</creator>
++  </meta>
++  <graph defaultedgetype="undirected" mode="static" name="">
++    <attributes mode="static" class="edge">
++      <attribute id="1" title="edge-number" type="float" />
++    </attributes>
++    <attributes mode="static" class="node">
++      <attribute id="0" title="number" type="int" />
++    </attributes>
++    <nodes>
++      <node id="0" label="0">
++        <attvalues>
++          <attvalue for="0" value="0" />
++        </attvalues>
++      </node>
++      <node id="1" label="1">
++        <attvalues>
++          <attvalue for="0" value="1" />
++        </attvalues>
++      </node>
++      <node id="2" label="2">
++        <attvalues>
++          <attvalue for="0" value="2" />
++        </attvalues>
++      </node>
++      <node id="3" label="3">
++        <attvalues>
++          <attvalue for="0" value="3" />
++        </attvalues>
++      </node>
++    </nodes>
++    <edges>
++      <edge source="0" target="1" id="0">
++        <attvalues>
++          <attvalue for="1" value="1.1" />
++        </attvalues>
++      </edge>
++      <edge source="1" target="2" id="1" />
++      <edge source="2" target="3" id="2" />
++    </edges>
++  </graph>
+ </gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
+         obtained = '\n'.join(nx.generate_gexf(G))
+         assert expected == obtained
diff --git a/dev-python/networkx/files/networkx-2.4-py39.patch b/dev-python/networkx/files/networkx-2.4-py39.patch
new file mode 100644
index 000000000000..7efe8998b35f
--- /dev/null
+++ b/dev-python/networkx/files/networkx-2.4-py39.patch
@@ -0,0 +1,46 @@
+From 0cb12b33df48788c10fa21b326803ae66d74cbe6 Mon Sep 17 00:00:00 2001
+From: Jarrod Millman <jarrod.millman@gmail.com>
+Date: Mon, 21 Oct 2019 00:56:04 -0700
+Subject: [PATCH] Remove unused imports
+
+---
+ .travis.yml                                         |  3 ---
+ networkx/algorithms/assortativity/connectivity.py   |  2 --
+ networkx/algorithms/assortativity/correlation.py    | 13 ++++++-------
+ networkx/algorithms/assortativity/mixing.py         |  1 -
+ .../algorithms/assortativity/neighbor_degree.py     |  1 -
+ networkx/algorithms/assortativity/pairs.py          |  1 -
+ networkx/algorithms/cluster.py                      |  1 -
+ networkx/algorithms/community/modularity_max.py     |  1 -
+ networkx/algorithms/components/biconnected.py       |  1 -
+ networkx/algorithms/isolate.py                      |  1 -
+ networkx/algorithms/isomorphism/isomorphvf2.py      |  1 -
+ networkx/algorithms/traversal/beamsearch.py         |  1 -
+ networkx/classes/graph.py                           |  2 +-
+ networkx/classes/reportviews.py                     |  1 -
+ networkx/conftest.py                                |  8 ++++++--
+ networkx/linalg/attrmatrix.py                       |  1 -
+ networkx/readwrite/gexf.py                          | 11 ++---------
+ networkx/readwrite/gpickle.py                       |  1 -
+ networkx/readwrite/graphml.py                       | 11 ++---------
+ networkx/readwrite/nx_yaml.py                       |  1 -
+ networkx/readwrite/tests/test_graphml.py            |  4 ++--
+ tools/travis/script.sh                              |  2 +-
+ 22 files changed, 20 insertions(+), 49 deletions(-)
+
+diff --git a/networkx/readwrite/tests/test_graphml.py b/networkx/readwrite/tests/test_graphml.py
+index 00b97d77..1946c487 100644
+--- a/networkx/readwrite/tests/test_graphml.py
++++ b/networkx/readwrite/tests/test_graphml.py
+@@ -879,7 +879,7 @@ class TestWriteGraphML(BaseGraphML):
+ 
+         xml = parse(fh)
+         # Children are the key elements, and the graph element
+-        children = xml.getroot().getchildren()
++        children = list(xml.getroot())
+         assert len(children) == 3
+ 
+         keys = [child.items() for child in children[:2]]
+-- 
+2.27.0
+
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index 081e31c0fa43..988703d38773 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-# networkx-2.4 supports up to python3_8
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+HOMEPAGE="https://networkx.github.io/ https://github.com/networkx/networkx"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -17,41 +16,40 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="
-	test? ( extras pandas scipy xml yaml )"
-
-COMMON_DEPEND="
+RDEPEND="
+	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-2.2.2[${PYTHON_USEDEP}]
 	extras? (
 		>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
-		>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+		' python3_{6,7,8})
 	)
 	pandas? (
-		$(python_gen_cond_dep '>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]' python3_{6,7})
+		>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
 	)
 	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
 	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	examples? (
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-	)"
+
+distutils_enable_tests pytest
 
 PATCHES=(
+	"${FILESDIR}"/${P}-py38.patch
+	"${FILESDIR}"/${P}-py39.patch
 )
 
-python_test() {
-	virtx nosetests -vv || die "tests failed with ${EPYTHON}"
+src_prepare() {
+	# incompatible deps?
+	sed -e 's:test_multigraph_edgelist_tuples:_&:' \
+		-i networkx/drawing/tests/test_pylab.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 python_install_all() {
@@ -59,10 +57,3 @@ python_install_all() {
 
 	distutils-r1_python_install_all
 }
-
-pkg_postinst() {
-	if use pandas && use python_targets_python3_8; then
-		ewarn "The pandas functionality in ${P} will not work with python3.8 as"
-		ewarn "dev-python/pandas does not have support for python3.8 yet"
-	fi
-}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index a7bbaa43c9e0..054d04ebb61d 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-EBUILD notify2-0.3.1-r1.ebuild 699 BLAKE2B aa9884b85017e89e17ba9fbfd12dd1dedaa32c2302b1de52603f45165c4d94e77dacb6c46556ad621d3c6469748c1f148a465f07e760a830168084eed2ea6a19 SHA512 ef00b83cfa27404a6c4caca9939931ec0ce8b2a238e9515981bc438cd05cc2ca5652e2688e89620c9512ba8bfa6d48958840c517f7bda310187da00dafc5c578
+EBUILD notify2-0.3.1-r1.ebuild 736 BLAKE2B f9d106bba3f2b85c3d92b13ed85fac5a09c65f660570b3dffd89f7e08f19d96cd074926aa6e7e4001a8f76773853ecc122fa7b66f35d78ae4aad1764b33bd214 SHA512 a0c81c6f952db062e2ff9e02dde8e9c1d9b070c1e90f970e2a5b9c51c5a97253b2c249e1120778b3261abdddc5762244549a175abb442b4d8e90af3e44aa28b6
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
index 8700640700ea..f93b2de1c5ab 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+BDEPEND="test? ( sys-apps/dbus[X] )"
 
 python_test() {
 	virtx ${EPYTHON} test_notify2.py
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index f83de629abd0..2a0f9e54710f 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,3 +1,5 @@
 DIST ntlm-auth-1.4.0.tar.gz 40745 BLAKE2B bf2c0dab7303cb0f87d83ed11d79bc12b8f74095f2f251c190eb43879bc0e9419dedf706fcb4929c51138658910bdfa836778084b34c974ca120aeb848e2da0e SHA512 abe0260c66e2b5f57c1fd672ea121129926f1c32020166dd61973cf51f6bd320f6057f3a148d602b96d8417c2ad57c335048da185100417401e049ff14b46004
+DIST ntlm-auth-1.5.0.tar.gz 41826 BLAKE2B fb313cdb4f1022e0cbc1ffcb048a587baca400a75e053ea8943d960f21746e847080db20169f55e6a3060a8b8502637ce7dc269b66bdaffe98c3f769b2b22358 SHA512 cf08b23e49d45c528404b70b6be88f6c3edee9fd0d4584f3962931a08a0982cdad4089963a95aea911b6eb4db32a932536cf6d9c02c292cd447e0a9c6b3b802b
 EBUILD ntlm-auth-1.4.0-r1.ebuild 515 BLAKE2B ffbc2ac4faafdf85be7ed0aabd7a36403ee3e2cf8daabb480020041b3731e067dc7fbcd19cbb7c36c76f2c66c1f48acabaae40f9121adba44eed3c302f6205c0 SHA512 664ff7d65ec506432254078a0bd30e9091a24f912a7aa6084c19ce5041f3e44e47d91c4aa3d5c291499a54c4ef8579de7a88a8e70ea2b3b9ed20bbbe49fed95e
+EBUILD ntlm-auth-1.5.0.ebuild 515 BLAKE2B ffbc2ac4faafdf85be7ed0aabd7a36403ee3e2cf8daabb480020041b3731e067dc7fbcd19cbb7c36c76f2c66c1f48acabaae40f9121adba44eed3c302f6205c0 SHA512 664ff7d65ec506432254078a0bd30e9091a24f912a7aa6084c19ce5041f3e44e47d91c4aa3d5c291499a54c4ef8579de7a88a8e70ea2b3b9ed20bbbe49fed95e
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
new file mode 100644
index 000000000000..0c194f2bc5c1
--- /dev/null
+++ b/dev-python/ntlm-auth/ntlm-auth-1.5.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,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Calculates NTLM Authentication codes"
+HOMEPAGE="https://github.com/jborean93/ntlm-auth"
+SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index c3ef530b861a..8507f1eb09f1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,6 +5,7 @@ DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b
 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-1.19.0.zip 7296082 BLAKE2B e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c SHA512 24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850
 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
@@ -12,4 +13,5 @@ EBUILD numpy-1.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993
 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
+EBUILD numpy-1.19.0.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.19.0.ebuild
new file mode 100644
index 000000000000..eb27fd1bee00
--- /dev/null
+++ b/dev-python/numpy/numpy-1.19.0.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/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 7525a95a9c23..14f403133881 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,5 +1,5 @@
 AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-4.1.3-r1.ebuild 1805 BLAKE2B 909428391f8b2ea08e45e7dcaf36c846bbc25c0051a45d50d9f5f063157c2f92a2ab55898f7883a5f3a3c3aafe07db7cef21479a5722252724fc8a393a19b1cc SHA512 01c53dc5dd9bfcd42b03ec6d7465688454ceab352fdee846836873fd7b2660c9df57c0a26b6cbdf5b157219405e1e26ee68b8063ff78e202a107fd6935b993a4
-EBUILD oauth2client-4.1.3.ebuild 1675 BLAKE2B 45e8323c902abc49e1f3f5813114935a57a545c89f5f4609220bab244e14e7d16c102654679f85aa3fcaa5c03c1a0b20e96a5df311bd8059741e9a5ce5b4368f SHA512 6de3dbeae6b0aafaf8f8c23c5e133716eda43a3e959a1880223969de8e3dbb87d587b9b1f60ef5ef0cb17234909d4c6273aba740eb586a87363e9343a9bd5781
-MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
+EBUILD oauth2client-4.1.3-r1.ebuild 1813 BLAKE2B 1171899000256d0f2da45c687ffafb7749d061ba1c0c8f454b9c00c4decaec3e57e8d6dc4e1340705d886533240fe3267c1a09a7753939368f5ff750c9dfb2f1 SHA512 50946e1f0a41b47f792b5018ab22394c8205273190834b91f3528f2f1b6dc0676a03d9f26863a2701a4b1efd01149218936630109ddac66764a736cd4acc66da
+EBUILD oauth2client-4.1.3.ebuild 1683 BLAKE2B d2b335f5dbb376a877641711b27aa0be0f3475f403fc110219cf66114dea7b49d658eaae8fb28a2174710e8ca740aa20d2d560d6fdcf33801afb9e434ebae14f SHA512 e93763a8b6fb6944123ebb1fa52fdfd0a3e591dbd68cfefdb7fd6704546753cf5e84d20872cda9eab21a9629197699e63424dc088019ffd548c5626ff1dbb3e1
+MISC metadata.xml 338 BLAKE2B 83fcd745b218d67169e4c38046821df108a4fe02d6ea671ef3ea5a317b21499d20ebbfb1d0575e651c34ccf9c907e281bdafa98c6cbde62eb5df86ce092b9285 SHA512 2148a99b18eff64225de89dfe5de617b5584423483a6265f1f7247adceb62ea53b3dabe2d185ff51a535494e81bdec3dda2de59c83320ce1f4febd665d101a3a
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
index 76abccb2a81a..9083df5a2ff2 100644
--- a/dev-python/oauth2client/metadata.xml
+++ b/dev-python/oauth2client/metadata.xml
@@ -6,6 +6,6 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">google/oauth2client</remote-id>
+    <remote-id type="github">googleapis/oauth2client</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
index 36afd8a2e568..3563b832a5a6 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/google/oauth2client"
-SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/googleapis/oauth2client"
+SRC_URI="https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/${P/_p/-post}
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
index d9282e2ee91e..5901030b4f92 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/google/oauth2client"
-SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/googleapis/oauth2client"
+SRC_URI="https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 1cccb3db7929..8c9adc005d0a 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
-EBUILD oauthlib-3.1.0.ebuild 730 BLAKE2B 07337142ae7363a13fd786126695c077b5989d26e93f6c00e64c33ca8fdb22672c2c4c69a2eb9f4d8247dce7ce83a01d0a996a019175f7a20170329109ec718c SHA512 9a357ef0087036af5d1d0bfb5be53de76f1394db9b23f5f08e692c98a240596d611c7af3856257cd082057cfafb2394ac70b9bcfcc1a9e4398ea22332d77cc1c
-MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
+EBUILD oauthlib-3.1.0.ebuild 735 BLAKE2B 4aa92a17513b21ae16bdfc52505218354b928c46598160b9c43499dc7ddc2191fbc653025013bb71a6992ddf871e71bae51836bc08263f117a35cfa47eb34f78 SHA512 2580936996eb14973ed1e6e3a6ba02fd5b7c8cb049dfb1a35b9debe96c056720e6443aa2ec0489d4409078318caad74d04116154f37ee75de3a3a4a0fb15def7
+MISC metadata.xml 380 BLAKE2B aabec34e131c6054ca301f037676730606c49f70870b4ac17d887fba068d6ae1bae2ca8fe74366f306903655665de5d93ded051bc2a61e5b97e3b09cd725fdda SHA512 920b499fff04028ef2a6e0df9ef5e71a7d598833ea41113b020eb8d7ff5b77a87d99ea8754d5192510901c84cb8c3b99709fcfee38d27c52a51afae7d917e058
diff --git a/dev-python/oauthlib/metadata.xml b/dev-python/oauthlib/metadata.xml
index ccc9e23ddbd7..ce755adad218 100644
--- a/dev-python/oauthlib/metadata.xml
+++ b/dev-python/oauthlib/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">oauthlib</remote-id>
-    <remote-id type="github">idan/oauthlib</remote-id>
+    <remote-id type="github">oauthlib/oauthlib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
index cd550a8c25bd..b395c45adf69 100644
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
+HOMEPAGE="https://github.com/ioauthlib/oauthlib https://pypi.org/project/oauthlib/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 31988af12c66..e2c819bb8778 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,5 @@
 DIST openstacksdk-0.36.0.tar.gz 887545 BLAKE2B 8a207e5d3a2c6989a1e7c881beaa35dca4617569eeb2efec5f917f4310a6e49549b3ddc9f8106566b7b1e620b2aab38507f92063f68e326f234166a5ea7b267b SHA512 e95cb7c626f8bdd0064ed69d767dc1d53742d9d7a0d6196058453113ddcab3bdd903a1ef7455a2f9fe4335733793c927a00fe333099ba142ef69945a287d3983
+DIST openstacksdk-0.46.0.tar.gz 928650 BLAKE2B f1cf41cc63efb0824ada0c9ac5fea2c1e9b7bc32482df612ba655c6bc94c707e4472c0a5995609914c4e73531aa730a28ee9612a2058a3867d7980581244e20c SHA512 188bb2b2ae9fd3100aa64356d282bc6402c6f175371d8b514ed753f1dd2b1774e3bab22ca45df455fbb7d813236012c0c5174578a84d3f87a3390821f888d709
 EBUILD openstacksdk-0.36.0.ebuild 1324 BLAKE2B e674ca88c81c984c631350b2617950b7622d83a627a09aca2db52bf1ef12c63e703e31faa449349f4e603080b52d9c55b99b083d5939d5f95f3434f2054ad162 SHA512 d39354584cccd47a93e2526138bcc3399782fb6c2552e6a80413aeac2b14d567e40cb021719e3a8b3afdf6c188a5c3d2c23176607268ae9f78c627228327d874
+EBUILD openstacksdk-0.46.0.ebuild 1326 BLAKE2B 1c222d30bfbb5dea44e6e6649d9da855c38fdf3d6d9ec1b2074e6e36c96d99669c4145b402415bd31b9bdf03ba8a7855f7afbabd4b92ef904b3fffe040e6f416 SHA512 a8f3f1f6374997bc569062ef0a31107eaaa45cd799af1c64773e5baa69d99316c8e822b10e9f04b6d556f765cea0c4290ad9f125606dc5f1430db453d3eeb413
 MISC metadata.xml 398 BLAKE2B 59bb0477f0821bc0460e08cf1f7702f105ef5cca807f5a509ff52823686faa6ffa3f6fcb18ddd92d7bf37450cfbdc42765de5929e552cceb917d3349a9fada86 SHA512 040d0a893c1f8b6e14b222ebafe34cc45de3b912840a2683811950939691d18b96a50bfb97126dfbf4e4736783e5fc584acc70bd3a149f340d41515012656426
diff --git a/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
new file mode 100644
index 000000000000..c6694550a51b
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
@@ -0,0 +1,38 @@
+# 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 collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+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/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
+	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index ac6990ed5a5d..3a031074bbf7 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,3 +1,5 @@
 DIST ordered-set-3.1.1.tar.gz 10520 BLAKE2B 885c24d5cb1db95d0056c9216bde16bc41b27e6489d8169ec2c60f93bf9fdf5e112b6183c4adc0d3a34209442db725d0afab3e53ac21420b223c9f4ddf2a9e49 SHA512 9a0d6c2fe1e678ebc5e4bb8229f2a97cfd0b579624f1f5e7153a9fe41937069a845271e431d626dff799136c3c90d8ecd7a7094de8b6f638c581ebe9c4e71ec6
+DIST ordered-set-4.0.1.tar.gz 10607 BLAKE2B e9bb24f8709c73099b83ee27abe30193ff1b530cd92fe3f2a43bc25212542d80e459fe404aa97aa7447ef52ea239153d427087f1ed517a7e7c8e18d68f27d0f2 SHA512 6ebe758efba7b847cce4a06001e84bf4a60728ae5d088cd7e3a2ebab86a6f5aa6a421bfda1cea0e8751bafd60eac1b3f2ec14e74a7b71f469dc7851aafe52235
 EBUILD ordered-set-3.1.1.ebuild 501 BLAKE2B 0a9dc7ec7f4846ff2d3c25be9c2453dc07ab177ba452de7116114f44fd5df70f76ca21dd2f9eba9a143065a6155b853c29330c580a1fbdcc819b6e36bdb139de SHA512 89007830d01382ddf3cb6acb07ee8bc504eb3c58ff94d35ece991b4e79554bf8ed7de2a891dd4d0a31fe7ad777fe6d86d0a13904d2aaf11b36ddede107a1b9eb
+EBUILD ordered-set-4.0.1.ebuild 503 BLAKE2B 888a417f2951f02f8b8a3e55a13af08ab9eb44f7098ffb9f2043c79a0e959698561e939e559aba81394f4dd5bfa754493b236c5b74b11b33cbb59a5ea8ff797a SHA512 6c1bcdeccd492f6c2b766c6396545364bd258832457c412d35749a16f9d8dfbd37f23c0ccaef094ee190aaf219b8e2b3f4a0235f8aa9fb45f1df3bc4f12425f6
 MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/ordered-set/ordered-set-4.0.1.ebuild b/dev-python/ordered-set/ordered-set-4.0.1.ebuild
new file mode 100644
index 000000000000..a2c0c812648a
--- /dev/null
+++ b/dev-python/ordered-set/ordered-set-4.0.1.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,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A mutable set that remembers the order of its entries"
+HOMEPAGE="https://github.com/LuminosoInsight/ordered-set"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 148c959dbdfc..4e1b57727f27 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,3 +1,5 @@
 DIST osc-lib-1.12.1.tar.gz 89641 BLAKE2B 06069dc38e72c2c008c730cb7a30279762c213b2715e70786e6d293a3087d9fe7d0b3b3a04fa343337bff6721d32bf25a35920e12dfeb03368d1308fc0331f12 SHA512 0b5c2e1376ea078f0641d3e2b69508539531b2d369f2171773ad5d44ded6f25112c3b0843dec11c481afd51b2b804d4e56736ae65a24ad4c59ab142b86da678f
+DIST osc-lib-2.0.0.tar.gz 93445 BLAKE2B eff1ba7e87fca3e6ba080066d46b7378f902ca6fea464ea6f5189175f7eb82d65b3a2d5cc5d4efc482412001505dd3edde48404f6dd448996f25233ceab6ac46 SHA512 6947ea6ac56b644dd9be4b3052905313c42c9ec46b4031d4c77e7df43292f3b04fa288e8aaaaad748eb7dd1a88edaa8d7d9263c8c7b899ce1607a7b2174e696d
 EBUILD osc-lib-1.12.1.ebuild 1170 BLAKE2B 9a947fcf245efeb4d51494df3fa4b74073eab452e77f14b23e4a04e9e54ca89476d900de65a4c6d8dcb746ea3772df5e30071b93a689e08d358603c9455cf4e6 SHA512 4ea1fc91b6267385bf6aa2ada31cc9cc767a338c0350f1e75310ed024dcc89269c89836c9ec76840ee655470f7427050f24db9715ed393f0ec88e726a01287d6
+EBUILD osc-lib-2.0.0.ebuild 1172 BLAKE2B 367a1a0d9b47f5f521728e70cbf68f1a8c7d7cde43aeb7095bd302d96cecf324d24627273189f7024761071a521a41057c4901fed391bd8ab9a9bf0c3682766d SHA512 c133fc30ce7a7f07c3c109f99bfb24248e2439cc26b659814b1e917a1b7b7d33a16265930413d0b51e096ce760c8f8a0bf566d31bd6c146499b3ace3ad173353
 MISC metadata.xml 703 BLAKE2B c8c0ecef0cabde0df016a0a65b6f29079fc44b98f23bfa74abd7e9c9305b3469fe103998262027d7f16d4132d0520c530d41cf28d869cf50bdec307dac6ae475 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4
diff --git a/dev-python/osc-lib/osc-lib-2.0.0.ebuild b/dev-python/osc-lib/osc-lib-2.0.0.ebuild
new file mode 100644
index 000000000000..ec6dd58f6bf2
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-2.0.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,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+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/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 5314998664bb..b5160d037c34 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,8 +2,10 @@ AUX pandas-0.24.2-skip-broken-test.patch 644 BLAKE2B 8a879cb0cf3f9b2e7c80a649fe3
 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
+DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8ca9bc782d55aeeab85d3768289849ccd0150291c33cab3442d38cedada91fb846abaade1b3905098edb06c06e SHA512 bb9e3ed9988f7b878ac6f9d7c6c054b119acfc4b960ae42ea92436979ef2098289123cac32b176753942a1edb3b6bd35c4eaf05112a25fbf8a89078fd76a2646
 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
+EBUILD pandas-1.0.4.ebuild 5705 BLAKE2B 02eb621b6a2e4ab3808cf2adc986fed43840ffc56526853a2ed6ea0cbb4440ea601956acc47c8066af8b9f67f533071d889e578a2a9f8de86f3c9c38d2d75d19 SHA512 929e4b1ff58cac671b7a7c7c200f4c546ef950def90b67ae14f838054d4a40b8ae0f32cf00798306f47bda70f6a55f6b9225862a892d7f1041876e2eb3693cd4
+EBUILD pandas-1.0.5.ebuild 5705 BLAKE2B 02eb621b6a2e4ab3808cf2adc986fed43840ffc56526853a2ed6ea0cbb4440ea601956acc47c8066af8b9f67f533071d889e578a2a9f8de86f3c9c38d2d75d19 SHA512 929e4b1ff58cac671b7a7c7c200f4c546ef950def90b67ae14f838054d4a40b8ae0f32cf00798306f47bda70f6a55f6b9225862a892d7f1041876e2eb3693cd4
+EBUILD pandas-9999.ebuild 5689 BLAKE2B 4bb1564c464ab25e04e6de09de01a3c60981697537b53533bf81a3bf057fe89950b3ecf87eebe55affb194e2658d2067a73b69aa0e5fd522e737466c32812374 SHA512 f2153d607503e1d6fb6a7b658ef250e95a83d0c0176b82612fc7338af3c83e8ee7441538f36c7963c33fd2b5d793462b4902d1642e6d38c8e6babaac984ae8af
 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
index c2bd75a1183a..979f4b8e0adf 100644
--- a/dev-python/pandas/pandas-1.0.4.ebuild
+++ b/dev-python/pandas/pandas-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
@@ -14,6 +14,7 @@ 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"
+S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
@@ -43,8 +44,10 @@ OPTIONAL_DEPEND="
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
 	dev-python/s3fs[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/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}]
@@ -63,7 +66,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
@@ -106,13 +109,15 @@ RDEPEND="${COMMON_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
 
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -126,13 +131,19 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
-	pushd  "${BUILD_DIR}"/lib > /dev/null
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
 	"${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
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
 }
 
 python_install_all() {
diff --git a/dev-python/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
new file mode 100644
index 000000000000..979f4b8e0adf
--- /dev/null
+++ b/dev-python/pandas/pandas-1.0.5.ebuild
@@ -0,0 +1,175 @@
+# 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(+)"
+
+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"
+S="${WORKDIR}/${P/_/}"
+
+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}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=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-0.29.20-r1[${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} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
+	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
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "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/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index e597cacdc2c8..5b361c58bd82 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -1,12 +1,13 @@
 # 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..9} )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 eutils flag-o-matic git-r3 virtualx
 
@@ -22,49 +23,50 @@ IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
 RECOMMENDED_DEPEND="
-	dev-python/bottleneck[${PYTHON_USEDEP}]
+	>=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/boto[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
-	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	|| (
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 	)
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/rpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/s3fs[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	dev-python/xarray[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
 		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
 			x11-misc/xclip
 			x11-misc/xsel
 		)
 	)
 "
 COMMON_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	>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-0.23[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
@@ -74,11 +76,12 @@ DEPEND="${COMMON_DEPEND}
 		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-1.2.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
@@ -89,8 +92,11 @@ DEPEND="${COMMON_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
@@ -99,8 +105,6 @@ DEPEND="${COMMON_DEPEND}
 # dev-python/statsmodels invokes a circular dep
 #  hence rm from doc? ( ), again
 RDEPEND="${COMMON_DEPEND}
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]
 	!minimal? ( ${RECOMMENDED_DEPEND} )
 	full-support? ( ${OPTIONAL_DEPEND} )
 "
@@ -110,9 +114,9 @@ python_prepare_all() {
 	sed -e "/^              'sphinx.ext.intersphinx',/d" \
 		-i doc/source/conf.py || die
 
-	# https://github.com/pydata/pandas/issues/11299
-	sed -e 's:testOdArray:disable:g' \
-		-i pandas/tests/io/json/test_ujson.py || die
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -127,14 +131,19 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
 	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. MPLCONFIGDIR=. \
-		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
 }
 
 python_install_all() {
@@ -153,8 +162,7 @@ pkg_postinst() {
 	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/boto
-	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	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
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
index ed9a413ff326..7fe38226e79f 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,3 +1,5 @@
 DIST partd-0.3.8.tar.gz 19171 BLAKE2B 1c96a3771ba8866ec1f8e8536909c433bc2cf914d0eee9ae01bd7d1255b44caed59b1dd71ff4f7c433c3429a86381757be1202dadd01cd65282687ddd0c1ad62 SHA512 3b7c642f7452a409eece356d2fe2e9430f6c5859b685c2ebe3d4cd8fbaa1c86e370174454f31b264ff8866ca9a9ab3bc0ca288f7ed123d8233ea3332f373d01d
+DIST partd-1.1.0.tar.gz 35497 BLAKE2B fb9461daccd5f3215471b201bd30be1fdd499f929490b1819899c7396d1d541fa46c629c26bcef5567df259ef0de1ec8effc3b7b498dec0235a4c0117a1c6014 SHA512 5e26c4a63fc2f9a290b211c1fce291da6b3354b4d0fdf941d29ddad1252629c94275ac360d33c88d11ff4e36a4f4d6bee42edd867c92eb7ef0d2697472c9a338
 EBUILD partd-0.3.8.ebuild 811 BLAKE2B b10cabf39cfbadb18eeda51853133cd055efbd9ba35679de868dfaa497861fe923df3fa7e86e23960837dc2f9753aeffe6503c25be7f1e88e93272272d9df926 SHA512 e9354160f8f560ff964b19a868f252407f8808bbd5f83bbc5358ecfebc398367bc5656707477399a10eb7fe61fdf64094e1d32e6f45f38702d5236a83f08e4fc
+EBUILD partd-1.1.0.ebuild 713 BLAKE2B 5ddba296f85f071302d45da21d300cc15b4861505aa1c614bdb5bb296339ef6684c14486702c61fa6ab8862138cc5544976c43ee267f3d554166b935115e8587 SHA512 dd843bf91a62bbae18a1a0d2f2d2f21c3d303e6ec9f7f08ecf4abc8e2a748b36f05a7b2b3062bd9aa934489125a8b6f864e2fda28fe6dce351c68e4ebab2a659
 MISC metadata.xml 668 BLAKE2B 5bee3dfee36d41021686daf6f8449311089503fafc31e9bc7a998bda70a5301e144fcb47925339f268f2caa27bfba06f3cea1e614d8d97b08ad611982ce712ec SHA512 30f9fb68a75ecadd72d03b01be181cc661ddc70b595fcef8cc5d9a98de089d585e2baa9615e9989af68cc4f1e520c8862b41ac769568c8a29a3c8877330fc52f
diff --git a/dev-python/partd/partd-1.1.0.ebuild b/dev-python/partd/partd-1.1.0.ebuild
new file mode 100644
index 000000000000..84f60be5c684
--- /dev/null
+++ b/dev-python/partd/partd-1.1.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Appendable key-value storage"
+HOMEPAGE="https://github.com/dask/partd/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/blosc[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index ddad6603e750..1f3c55188728 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,5 +1,5 @@
 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 1030 BLAKE2B 8188cff70bb46b853874d02d891cddb8e091bb501e509b96e8ce2b43f1846f9a61d19b772321868fb41ee10da2208b57d121128fb49966ba146ff9f25a94ef25 SHA512 a861ae15b973688dd4754955436318d406fc6edbd8d4b311124ed83849fdc4e53935a47e7135fdbfafd664d10b8f4a3eaecb405f7913ab6f319bb0189e1e5a1f
+EBUILD passlib-1.7.2.ebuild 1037 BLAKE2B b00dcee17479443e2e463884308ba4df036d62e49f8c0b36f8afb0fa5ffa531f37e32b5a638c029a550768c7d32ad16110206e71fe46bc15afcc9572497774b8 SHA512 71a9e4e035aa145bbdb2834d6051e073ea289f864fa9a7ed4f2ba425639056677c4841a660c4a3fefd952358ca500e7dcfa4444293200e62e86a66a8ffc9ebfe
 MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index 1a5df3be3aab..0794ac4dad0f 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Password hashing framework supporting over 20 schemes"
-HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
+HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/peak-rules/Manifest b/dev-python/peak-rules/Manifest
deleted file mode 100644
index 99a124cbd261..000000000000
--- a/dev-python/peak-rules/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST peak-rules-0.5.tar.gz 113173 BLAKE2B 374e533d1e4127d721d0133a8c0e4faa02fe12d2c7e4eee8cb5e6b5ae5c30e6fd81858ef44a28df45d300f3c46efdbd660998b916a21481c8c2841e064442569 SHA512 7ab915641829f6366b681b4c576e7213097cbd2be76bd526fdbb4f128762c04c08ee20e3fe3ef36e1df0e544719f71c28079745c9c88f98911074da51ecfa169
-EBUILD peak-rules-0.5.ebuild 1328 BLAKE2B 06bebc5f7a179fb43540db3575abad5d2110d26524009333fac7258bc33f7f67853d6b949d8ff07cc50d8211dcfc101fbec720e62ac116496000e7e02eea70e9 SHA512 8b94de6dd06c52db3de10610b976d8b762cd9ed15b066d2eabbce86a336b78fd32c5fb4a7f04618b409abd5abd49b5886fa455936260506349659470958d7f08
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/peak-rules/peak-rules-0.5.ebuild b/dev-python/peak-rules/peak-rules-0.5.ebuild
deleted file mode 100644
index 2d5b38bf6e7c..000000000000
--- a/dev-python/peak-rules/peak-rules-0.5.ebuild
+++ /dev/null
@@ -1,44 +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
-
-MY_PN="PEAK-Rules"
-MY_P="${MY_PN}-${PV}a1.dev-r2713"
-
-DESCRIPTION="Generic functions and business rules support systems"
-HOMEPAGE="http://peak.telecommunity.com/ https://pypi.org/project/PEAK-Rules/"
-SRC_URI="http://peak.telecommunity.com/snapshots/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS=( Code-Generation.txt Criteria.txt Indexing.txt README.txt Syntax-Matching.txt  )
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/bytecodeassembler-0.6[${PYTHON_USEDEP}]
-	>=dev-python/addons-0.6[${PYTHON_USEDEP}]
-	>=dev-python/extremes-1.1[${PYTHON_USEDEP}]
-	test? ( >=dev-python/importing-1.10[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	PYTHONPATH=$PYTHONPATH:"${S}"/peak/rules/ "${PYTHON}" test_rules.py \
-		&& einfo "Tests passed under ${EPYTHON}" \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-src_test() {
-	# Relative import misfires for core.py during emerge
-	sed -e "s:from peak.rules.core:from core:" -i test_rules.py
-	distutils-r1_src_test
-	# Return to original statefor final install
-	sed -e "s:from core:from peak.rules.core:" -i test_rules.py
-}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 9b11e14ce2d1..8a5afba6e9fe 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,6 +1,8 @@
 AUX pikepdf-1.8.3-test.patch 1383 BLAKE2B 18ac2e4ad4fd2c1e6db158ecd87505ef3099a5053d3d4b5b96a2b1179eeeb77218ba0582e1f25975f5f94867220fd382c82ca960da404154ea67008cd389ff82 SHA512 6db05c94c09f5474f53bd2dd77b0ebdf6cecb4cf00ae5c344b1795bd81379f072856c7d06c05630d40c878ba2fd9b09c918d0f6fe364b54fea720638135caf0c
 DIST pikepdf-1.13.0.tar.gz 2140229 BLAKE2B 886bb9395e8fa1105385908a06d076f78bb1712186a8cb0eafbe54d22a0c95fa2bc8eba8f2e3d60ec3b1392d550cd38c6486c601eba2ef167c718fa26b472f9e SHA512 48304f85e73148dbcfae50ecc5767686b46ce9d44b13eb3f991ab3b358b99208383627abdb5ef3c17cf31a422872ea0bae7560e9c7c36130c6009563b6169f4d
+DIST pikepdf-1.14.0.tar.gz 2140844 BLAKE2B 75a408ded51e82cd7970eb94214d2e4f40ea0fa0a4915d83caace9b1fcad75fe2d7f7f1917e307d5ba8f2107dc1ae4fd46125b05d7ea175444c479945293d5a7 SHA512 bbd6a024324812f2ecee7c424fe53a2e32a6534c909cef60661faea40e58bfc067017f26d8676fb336e618e6cd7b008729cb6753202a18ed6fd86bbfbb36662b
 DIST pikepdf-1.8.3.tar.gz 1649370 BLAKE2B c655eb2a9304eb624b5f3dd3ea68ff3194f5a508b4249ef0643689945c28bbe9eaad015df481516d6cfce6768a70a34377725a7995b448f22a2eb025b4967e71 SHA512 5cb674042dca6850df7cf9476743956967d0ad168ac6bdadda03895a604f6c3670849e33ab863e7686eaa46922489d6dd1da9883d19a721c8021323d768086a9
 EBUILD pikepdf-1.13.0.ebuild 1485 BLAKE2B 617c0d51888b58058446013d346f15eb1169a3b3bf90afbac3d6d6814766d5ae3416eebf24ad13470bc10c64269c9d35ce6dfd216e668d447339eaf57bbde637 SHA512 f9fa0b061e0801a0321edd80f4a7ab28305dfaa687fedfe0f559cf96a0edbbb06b50751a32093a0712446c76eaccffd9d38a672d3b9018cf71410593c802047f
+EBUILD pikepdf-1.14.0.ebuild 1486 BLAKE2B a806be77b6a9aae8daddeca01f045c58ec97694850a2bc375e9e32179292c401c090c710465c129c72bb199faa0aeb75ef2fbd672a3416ba5635e2528b8f5d45 SHA512 7e2eee7072ea8fbfcd3090bbbe452516bb1db4eac0abc3b821fc44a97a1fd7e74b2aacc5cd6a3128163c16d7f62ce393001758a2864ad8182704e63b98d15630
 EBUILD pikepdf-1.8.3.ebuild 1476 BLAKE2B a8b6d92586c808f85d173962fd138d70a0f4385ba6227ad1e679bbbaee5929c035c4f9b22b821fe7113910ee056c28ef8c96b3272edf984b51ec54d57c3ebcf1 SHA512 54281c35dedb20e9e17716d27f49690baafae3f32cbb15f35d20acb09b2e3618d7cc457bc4f46755bc6519ee946ecbe0f90515007cd71834db9580d70e915ecd
 MISC metadata.xml 579 BLAKE2B 010d66d2d00284f744a85bebf5b916e77efc7f46f880886815bc677007ae0f71b5f19b6caf6cc49c05e1e9ce13c954876e8d13b988a533af2fb68de147e6911a SHA512 3f41579208b5354e6361d6cd1f035bf0e5819fd90575e15c684cf501ca33bc14b6c4a7b70040cd5f44796a8ca58810535734787ce84ce8183d0cadc14d6c1f01
diff --git a/dev-python/pikepdf/pikepdf-1.14.0.ebuild b/dev-python/pikepdf/pikepdf-1.14.0.ebuild
new file mode 100644
index 000000000000..ea2da43b0439
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-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,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? ( >=dev-python/attrs-19.1.0
+		>=dev-python/hypothesis-4.24
+		<dev-python/hypothesis-6.0
+		>=dev-python/pillow-5.0.0
+		>=dev-python/pytest-4.4.0
+		<dev-python/pytest-5.3.5
+		>=dev-python/pytest-xdist-1.28
+		<dev-python/pytest-xdist-2.0
+		>=dev-python/pytest-helpers-namespace-2019.1.8
+		>=dev-python/pytest-timeout-1.3.3
+		>=dev-python/python-xmp-toolkit-2.0.1 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+#		dev-python/matplotlib
+#		dev-python/sphinx-1.4
+#		dev-python/sphinx_rtd_theme )"
+#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
+#}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 738a1a7179c9..9a593abc8290 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -15,7 +15,7 @@ DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30
 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 3968 BLAKE2B 6c0e2c5daeee3afa0c575e0f3a54600bd16f5bef748800a17fa05f444818e3fdb28a9825f1c89d0052a01555ebc623fb8c1f16f74cfef5fed1085ea3bd1dedb1 SHA512 8202150be54533c2420909fc339c2c53b8ddd93733cbfd9b9070034bbef2ea02335ca519f15d39a1e6e77de39a17833fde7c92b765edffde270eff56bd3d16a1
-EBUILD pip-20.0.2.ebuild 4029 BLAKE2B 65fdcd0369790dc039c2f66d9d0a1723a9f90c5e57692e5e53d54121949a09a783c69e26ea506f9fabf3bf2bc00fccef9e9991db6538e8f7171e714123a96af5 SHA512 61b0ec7258af40912350698ec237429aad215e6b776337637bc309935c6f6ff02b9af61b6df8d5107c38a58590d0df0723743b3da002641a57d82796ae3061f2
+EBUILD pip-20.0.2.ebuild 4028 BLAKE2B 3a3ff94b364fcffe375f1844ecb0229a6680187397947b7bb523b97342287b81c4ac7b5f38cc142e4f1312f560c9446187a2228946f69310f939e4f544b8c64a SHA512 b534a5277ff82e3ce2c62b5a7c0c07591879a4786e025583a292d57d9a8e90f91f7f230fef05221f8f097ffcef4afcf72c298ad6c3848ace4ba930af1b216d5f
 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
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index fa155d4b02da..fcb8d78d31a7 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 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 51d48d085838..5b45add75590 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,3 @@
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
-EBUILD process-tests-2.0.2.ebuild 690 BLAKE2B 6b95b1366ab17d02975887a78f9e14911f219b9559cb8f940d1f18bd6522c0a56271c50a72392d18780f0d09c7d02ab967249fd6e053558b48399cf6c5471d19 SHA512 e3b98732dc41ce9a5a70e427300b91eaa71d8fdc002086e49b5d9e3f89e042a7eac0438b996c8c1f9d7bc55da01780ea8d0b0909e073a13e6d028a81cd76e915
+EBUILD process-tests-2.0.2.ebuild 638 BLAKE2B e0b8cfc8997e79f6c45d86a617f6e3c9b8725c070fe2c0d837a5de093bb3892d9f8a4778c3caa74a78d1c142854a71d632b9709684b67c6c7911b7d9651a165f SHA512 ac7ea0b9445637cf77156d8cf30ec4c5470f5b200f22dad869fb1a5d9a1984f7b21a0cb821fe75c8126a51be44e693a5917cbbd1e2275e02ba2d38ded8510f38
 MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/process-tests/process-tests-2.0.2.ebuild b/dev-python/process-tests/process-tests-2.0.2.ebuild
index ad8c020d48bf..0a4a499d8299 100644
--- a/dev-python/process-tests/process-tests-2.0.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.0.2.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
 
@@ -15,8 +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}]"
-
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
 RESTRICT="test"
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 6f2a8c96b911..277f2750fdaf 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,4 +1,4 @@
 AUX pydot-1.4.1-unittest.patch 3496 BLAKE2B d5aa063d1700836c2aa967c0856c4b693f0820f1c3ecf41de444781a29f4ff4fde6d8d2cbb30458364efe47154fb6ad50c545fc45fff6fd27864483ab4bef2e6 SHA512 0204de6a767d062e4074344ce093da6789145407c7aab3706abc72d15e655489b7e43f1038b8d5951ac9a107aa0ca8a399e119826100d05433d13b537ae48cdb
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
-EBUILD pydot-1.4.1.ebuild 966 BLAKE2B de3b7b6dc739418de9a871db99a9f17149a16dd33d8fb018ce7799452edc0abbdd44a1b8b6adc8c5a22e14495984c7b12ccf611119ef9a2416c7f4d2178e6fec SHA512 ad538cca69c45aec545473877b05be6ad657b5287205df9599da717599850ab35996d033082342a40a1bb3e4941a70c6d891d302c5d8ee7369e234f383764415
+EBUILD pydot-1.4.1.ebuild 931 BLAKE2B ec465d1110cfb856ed5f9573b454ccb8e888ac97fc9eaf5eb0e4fcb89d075b43751f13e3e4b2f5cc45d7d93ecdf3c6a64a74fd28318a948dd3f333656f946152 SHA512 23c4b6e70f6b2a978e915da0576d63be4f349c2e3fb7f5a4b23aafd661261fe0722169051ba54bbdfd75c4b24a7cecbf25e732d404644dd3191699dd35c25d9a
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index b740101098cc..224ae09f8d9f 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.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
 
@@ -20,9 +20,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/pyparsing-2.1.4[${PYTHON_USEDEP}]
 	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-unittest.patch
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 413fd5833acf..33d61950cf15 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,7 +1,7 @@
 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
 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-r1.ebuild 2117 BLAKE2B d9635c59a2064809e8e8e4a6ffe2f0fecded0b3a8d49439210dbc01aa9f3fadd582fcefab30af5ec9818be34d3269c82f84553a0be94cc22a5d17739dcb98588 SHA512 8aa1b69e1faa035bc37b1ad57bff067f27c51d3ce7bac19a83d3c8c65075c956ee58547287e14c14c3745b3a232ebd0b8c8f845392ff6d4e8100225dc145a825
 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
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index 253ffc048c4a..e47cb5f359bc 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -4,10 +4,10 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit flag-o-matic distutils-r1 virtualx
+inherit flag-o-matic distutils-r1
 
 DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="http://www.pygame.org/"
+HOMEPAGE="https://www.pygame.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -62,12 +62,10 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
-src_test() {
-	virtx distutils-r1_src_test
-}
-
 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
 }
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 943fdd1873da..588db22501fb 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,6 +1,5 @@
-AUX pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 489 BLAKE2B c88ffa0b90c8201450e6d404c25381ec04ea92bf4ca457e0268c03f18c7416cbe406206998f140d27b4975786dd1dd37e166d7de2848ddb34ced80db87a51651 SHA512 3bc754eb0fa70f5b4a88d5a547bc97a2813a78daf0afa1489842aee6e63d7d1933911b18ba88719208463ccd44f318d9f4bc850aef1e762e4d2bf35e20b36951
-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
+DIST PyICU-2.5.tar.gz 225591 BLAKE2B 0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151 SHA512 b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
 EBUILD pyicu-2.4.3.ebuild 541 BLAKE2B aeff740a3137edc2947e797c527e52b6306c283aa6610f23a827f3a77f47f7801922416d7b48c2aa79032f02eb6e254663507f5470a05201d99ae76a8bedb8c1 SHA512 d9d12f2f1a1982026b2955ce9bda2b687360176e3d2ebb1d6209689964d3d6f12532957973e7ca6ea057d16a3a6ed761e5fe6e8eeb9e7af282e0837e20b8d967
+EBUILD pyicu-2.5.ebuild 543 BLAKE2B da8a39e4f4807dfff127d126fbe2b7364ce78f977a45011ff9398b085d8a99ad6bd79b1786d32054dba0599c9e34f389bde6381ef63eff88b88791f96b3fb213 SHA512 99e658752ab69dd1113a07fe1c6698b67079cf183b1e239ca07bd421f9ee7993c483b30156eff78c2c485c84d77493e10cccc7eaac2de8ce9e9eb26a2df00d57
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch b/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
deleted file mode 100644
index ab1fed8dc7f1..000000000000
--- a/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/test/test_LocaleMatcher.py
-+++ b/test/test_LocaleMatcher.py
-@@ -21,11 +21,13 @@
- # DEALINGS IN THE SOFTWARE.
- # ====================================================================
- 
--import sys, os, six
-+import sys, os, six, pytest
- 
- from unittest import TestCase, main
- from icu import *
- 
-+@pytest.mark.skipif(ICU_VERSION < '65.0',
-+                    reason='ICU too old for LocaleMatcher support')
- class TestLocaleMatcher(TestCase):
- 
-     def testSetSupportedLocales(self):
diff --git a/dev-python/pyicu/pyicu-2.4.2.ebuild b/dev-python/pyicu/pyicu-2.5.ebuild
index 330fe964470e..b22a46704638 100644
--- a/dev-python/pyicu/pyicu-2.4.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.5.ebuild
@@ -16,18 +16,13 @@ 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="${PYTHON_DEPS}
-	dev-libs/icu:="
+RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.2-testLocaleMatcher_pytest_old_icu.patch
-)
-
 S="${WORKDIR}/${MY_P}"
 
-DOCS=(CHANGES CREDITS README.md)
+DOCS=( CHANGES CREDITS README.md )
 
 distutils_enable_tests pytest
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 876363f8b7f4..cc28b26026e4 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 2005 BLAKE2B 14a0e3a2fc9697d5d7d380dcc11a47afdc726047c3cbaae42eaa61896d0af8ea76d152102d2a08bca411642b103572c24e01befaff499d506a4f73ac8a9d7852 SHA512 a6f1c461625d617551140f03ae51c4597ef24d9f904365822d334f0e5ea6273fe94e763a94415d218234cdbadbfc20ae1b2539c8bbc70b5050a4ba4eb577f16a
+EBUILD pylibmc-1.6.1-r1.ebuild 1533 BLAKE2B 4e6154fe0dae4b8f18780176f623cc19c3911071070ef45681bd953f1449514676bfa4b97be48baf203bb630e1756e5276cac2186c9f07c7e751f82bc5eb29c8 SHA512 4892d7c6b72d2e5fac2584ca7e4c7e8d82a6446fac26bc7d807ee635ff760eaf63a165b8ce465af29cf4d8bf7b63b88c942b6d7b287deb255d63f79bda38b5b2
 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 42727e34ff9c..c07978f38906 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -2,12 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Libmemcached wrapper written as a Python extension"
-HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/"
+HOMEPAGE="
+	https://sendapatch.se/projects/pylibmc/
+	https://pypi.org/project/pylibmc/
+	https://github.com/lericson/pylibmc/"
 # One image is missing from the doc at PyPI
 # https://github.com/lericson/pylibmc/pull/221
 SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -15,35 +20,24 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="doc test"
-
-# implementations to use for building docs, separate from PYTHON_COMPAT since
-# dev-python/sphinx might not be available everywhere
-DOCS_PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/libmemcached-0.32"
 # Older sphinx versions fail to compile the doc
 # https://github.com/sphinx-doc/sphinx/issues/3266
-BDEPEND="${RDEPEND}
-	doc? ( $(python_gen_cond_dep '
-		>=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}]' "${DOCS_PYTHON_COMPAT[@]}")
-	)
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		net-misc/memcached
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
 
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags "${DOCS_PYTHON_COMPAT[@]}") ) )"
-
 PATCHES=(
 	"${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
 )
 
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( "${DOCS_PYTHON_COMPAT[@]}" )
-}
+distutils_enable_sphinx docs
 
 python_prepare_all() {
 	sed -e "/with-info=1/d" -i setup.cfg || die
@@ -51,22 +45,20 @@ python_prepare_all() {
 	# some amazon thing, expects to be in AWS
 	rm tests/test_autoconf.py || die
 	distutils-r1_python_prepare_all
+
+	# needed for docs
+	export PYLIBMC_DIR=.
 }
 
-python_compile_all() {
-	if use doc; then
-		# This variable is added to sys.path
-		# but it does not seem to be useful
-		PYLIBMC_DIR="." emake -C docs
-		HTML_DOCS=( docs/_build/html/. )
-	fi
+src_test() {
+	local -x MEMCACHED_PORT=11219
+	memcached -d -p "${MEMCACHED_PORT}" -u nobody -l localhost \
+		-P "${T}/m.pid" || die
+	distutils-r1_src_test
+	kill "$(<"${T}/m.pid")" || die
 }
 
 python_test() {
 	distutils_install_for_testing
-	memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
-	MEMCACHED_PORT=11219 nosetests -v
-	local ret=${?}
-	kill "$(<"${T}/m.pid")" || die
-	[[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
+	nosetests -v || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index d536bfb0b466..bf83aa0a835d 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,10 @@
 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
+AUX pylint-2.5.3-no-pytest-runner.patch 533 BLAKE2B 0882d3b057cd214ac04645c3992585e9550624f551206d863817940846fc6bd7d863431c33df46f0a83379fdc3ab411949b73f0475e08fd7debd465d83e848eb SHA512 9ed1784e83693b2aeff1862f9592fa574f20bb2d513f3bdef34b895263a31d6d747b4c76d09e6d48e15031388cd70b01caabfd84628ca98e1634fa42b6988eae
+AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf706601ccb841642eef83ae9eccb7d6863da6c7957f9f49a81f24d17e72d835c3740ef177ced6356bec7510a0221 SHA512 dd1930e47dc342cb76fe55fad22cde3b4d5935a62c62d740b75e27701606bb8d5513b8f2c9e2f3116c0456a545a2c56f6d75b87903e2cdec1df97e4b8ed1b532
 DIST pylint-2.4.4.tar.gz 646113 BLAKE2B d62b66b056e01cc13e90f45ff4a11f94983e0b9b42b9a05e5c7b7385280000d15ead9a282e7eea31a8ee6a24ffe539576a6e9bd40dc4d89093263da99029123b SHA512 835e0687ebc76c530e0042c5a5188b8aedab446531f621627e990cbeb37ab6ecc8de0f8c6ab171abaa63488e049e8d7782958461421f9a4127435f56b6d2ed0b
+DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
 EBUILD pylint-2.4.4-r1.ebuild 1439 BLAKE2B bc1fa51468b6a549822af2ce99167ae59eac62aea5b1467e438644d2104ae794b66d5705903f024e4bf90ac4a85cfb5f1e9cfe108c67b855aed588039d1ea1f3 SHA512 fc5a9a05f628bf64833e9975a3e9d6a18772c18b450a3f464fe7a9643780bcbb7c7b8320767e7f853329c5d187de6d0a6c6612cf6ce4b611347f17887fcb4277
+EBUILD pylint-2.5.3.ebuild 1611 BLAKE2B 0542a405a65a115dffa3103208fc486461c10a5f0f452adfbcae8ed1943e821e3a879a9a0450a6b6e90e4d49a3e5f731f1eb6f953d28d5a4f7c3f708268badb0 SHA512 f82e640ca05771b6827e951d9b1cb30e07230a8f5ee329b3030df31ded627a53cd8585e89d048c8ba9a9f9d6cfaf69ce9c3101d56eef61ec85327520688bf75e
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
new file mode 100644
index 000000000000..f4cc6be360de
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
@@ -0,0 +1,20 @@
+diff --git a/setup.py b/setup.py
+index 92d059ff..cbc5b881 100644
+--- a/setup.py
++++ b/setup.py
+@@ -67,7 +67,6 @@ else:
+ 
+ 
+ needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
+-pytest_runner = ["pytest-runner"] if needs_pytest else []
+ 
+ 
+ def ensure_scripts(linux_scripts):
+@@ -151,7 +150,6 @@ def install(**kwargs):
+         extras_require=extras_require,
+         test_suite="test",
+         python_requires=">=3.5.*",
+-        setup_requires=pytest_runner,
+         tests_require=["pytest"],
+         **kwargs
+     )
diff --git a/dev-python/pylint/files/pylint-2.5.3-tests.patch b/dev-python/pylint/files/pylint-2.5.3-tests.patch
new file mode 100644
index 000000000000..72a42e4caaeb
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.5.3-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/test_self.py b/tests/test_self.py
+index 6c27fd6c..9fde0214 100644
+--- a/tests/test_self.py
++++ b/tests/test_self.py
+@@ -686,6 +686,7 @@ class TestRunTC:
+         )
+ 
+     @staticmethod
++    @pytest.mark.skip("seems to be failing to import nonexistant module")
+     def test_do_not_import_files_from_local_directory(tmpdir):
+         p_astroid = tmpdir / "astroid.py"
+         p_astroid.write("'Docstring'\nimport completely_unknown\n")
diff --git a/dev-python/pylint/pylint-2.5.3.ebuild b/dev-python/pylint/pylint-2.5.3.ebuild
new file mode 100644
index 000000000000..d2d671ed0622
--- /dev/null
+++ b/dev-python/pylint/pylint-2.5.3.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=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+# entry_points is added via **kwargs in a dict
+_DISTUTILS_SETUPTOOLS_WARNED=1
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/astroid-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.5.3-no-pytest-runner.patch"
+	"${FILESDIR}/${PN}-2.5.3-tests.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# we don't want to run the benchmarking tests
+	rm -f tests/benchmark/test_baseline_benchmarks.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
+}
diff --git a/dev-python/pyprotocols/Manifest b/dev-python/pyprotocols/Manifest
deleted file mode 100644
index f887ea5257e9..000000000000
--- a/dev-python/pyprotocols/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX SkipTests.patch 619 BLAKE2B 69c78ea58acbe0f952df3f7586683b8b41b7857b7e83f6b14d83f5b8135fc1fa574bd3869e312e734b69baead72c6c782d8c27a95768ae89c9695c5cc677b8d2 SHA512 b4f37fdcb0eb10d58813d3bfe776de9a56549f768eb974ec2a8818ca891181a1551cf8c8ee99865aade77f4aef330e617053bde58824f288a876da0beb4f8d51
-DIST PyProtocols-1.0a0dev_r2306.tar.gz 218555 BLAKE2B 77862a59343b21a97f1bbc5281f397652108912669e6e550e2ae7ad7f4e95c181b8315a940f5b737e20468fba1bec42b4539571ee8ab54a41737fcdc5e3e7a70 SHA512 1f18be9548ae29b6111dccd158f5706f3a1ed7074152e9ef2e0d17caaad2227d3f613b50b602b3b1d47b5db7f53e583fce4e06b3e23916ac0daf7a92bcd66ccc
-EBUILD pyprotocols-1.0_pre2306-r1.ebuild 1196 BLAKE2B 25225fda7cb84531dd81ae32622b0cba18d4c2de1555f73d12518b20322fe5ef16c5d87185bf1a3b9ae9c2427d4f7844a6f36c3f1ded21fbc0e6b905f32d040a SHA512 55ca37683aec6a671aea96f1b6b18165e386e65a2e777b4efdf2671aeaf234cf7df015ba99fe9c3fdbaaac2917bbf53d79bc463a4f0cde815b79edb81b5b8f1e
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyprotocols/files/SkipTests.patch b/dev-python/pyprotocols/files/SkipTests.patch
deleted file mode 100644
index 293f0a2a0626..000000000000
--- a/dev-python/pyprotocols/files/SkipTests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/protocols/tests/__init__.py
-+++ b/src/protocols/tests/__init__.py
-@@ -256,22 +256,6 @@
-         makeSuite(GenerationTests,'check'),
-     ]
- 
--    try:
--        import zope.interface
--    except ImportError:
--        pass
--    else:
--        from protocols.tests import test_zope
--        tests.append( test_zope.test_suite() )
--
--    try:
--        from twisted.python.components import Interface
--    except (ImportError, SystemError):
--        pass
--    else:
--        from protocols.tests import test_twisted
--        tests.append( test_twisted.test_suite() )
--
-     return TestSuite(
-         tests
-     )
diff --git a/dev-python/pyprotocols/metadata.xml b/dev-python/pyprotocols/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyprotocols/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
deleted file mode 100644
index b02638a61800..000000000000
--- a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="PyProtocols"
-MY_P="${MY_PN}-${PV/_pre/a0dev_r}"
-
-DESCRIPTION="Extends the PEP 246 adapt function with a new 'declaration API'"
-HOMEPAGE="http://peak.telecommunity.com/PyProtocols.html https://pypi.org/project/PyProtocols/ \
-	http://svn.eby-sarna.com/PyProtocols/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="|| ( PSF-2 ZPL )"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/decoratortools-1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/pyrex-0.9.9[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}"/SkipTests.patch )
-DOCS=( CHANGES.txt README.txt UPGRADING.txt )
-
-python_prepare_all() {
-	# Rm peripheral & rogue failing tests
-	rm -f src//protocols/tests/{test_twisted.py,test_zope.py} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 93e269ca983e..2dfd3d593cde 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,5 +1,7 @@
 DIST pysol_cards-0.8.16.tar.gz 20203 BLAKE2B cbff4eedefd42380729233a9e928fd6d8e5683716651c60292d4dd1052ba7faf071c3fe61d222313a5bd2ade3da58e6f762371b717815c5f57a479aab9a6bc1c SHA512 fb165076232f9cc62520466bec58dd29c1277de54bde448674d20b9fe00628ba4df3b6d522cc4bd6aa5e18f148f14804de41e8ca1d055ebce0b7d5a2bae3ee89
+DIST pysol_cards-0.8.18.tar.gz 20324 BLAKE2B 230dcb57ed5d8f75f70bb55ef339347fb7ecd9877b29fc72237fab7595b15fc1ec28b56021a66478c1d4f5f5139562b976155267b1e4e325559a74f68869b98b SHA512 86f0e110b354703745f16410d4f9f8187173a2ae06088d18e7e87b3b6e3149422b3b442e8384f3863ace34de844d9aaab4c080d3e286b4890b188621b6101d06
 DIST pysol_cards-0.8.9.tar.gz 19522 BLAKE2B 06e257f2ccb43236c311d03436d7b482df977d63c0b886c7705e4cfee4abec4eae495a5557053ba2a18a84da227cc4bd913263e98533ab3a17616843df0a35c7 SHA512 548f586c70a583812731f2273f1c57406a31667b395c4276ec94518471499e69d278d54e2910f7c64a4c52deb670b0e76eef55399af9e2b997422ecbbd9a79a9
 EBUILD pysol_cards-0.8.16.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
+EBUILD pysol_cards-0.8.18.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
 EBUILD pysol_cards-0.8.9.ebuild 549 BLAKE2B f8853c4c8395a41ba1e4f103df1a1e9d0d2092dcbb35d8002c24543ece55858d0db929384ec4a89acc0c9410049ad789e016a0090b9eb2c04a670ff0317b3e92 SHA512 714fd9150f5ab51d91e9cd19eb5245c4e0a1004f2477cb917eeacd950cb005779c87d39bb95cbc64b455bfbc24cb6165e5b34f2d28a3da34c1d4783a4cf49848
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.18.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.18.ebuild
new file mode 100644
index 000000000000..9407aad9b5fa
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.8.18.ebuild
@@ -0,0 +1,24 @@
+# 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="Deal PySol FreeCell cards"
+HOMEPAGE="https://pypi.org/project/pysol-cards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index f7729bddd673..ff1c0f55166c 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -3,5 +3,5 @@ AUX pysvn-1.9.11-respect-flags.patch 5627 BLAKE2B 6a3b4b26581ed05251380eb13b6e77
 DIST pysvn-1.8.0.tar.gz 366583 BLAKE2B b7aae274bd2387901df4075ffa70d73e4462a127aa6690aecc406288a9e8dc2f31599297480cfc5fef14ef39c47daa3c309b6c61f49d781abb4d8c0f9a9fcb12 SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b
 DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89
 EBUILD pysvn-1.8.0.ebuild 1309 BLAKE2B 4cc934dc07ff1bb7084421eee64e5febd9ed99bbd790a9b1d29029b4d921058e54f453fa2ecc538c52bc3e921762b37aa9f7a82878a7d46edb1597d994e36616 SHA512 114212ff03e8e78a8a08a6cf0636daa5c2f198a74353947f3a9ae237e61fd943ac5f54e5d452088237f4ed61352a63e139086a280688130b90a9f9114f5bccc6
-EBUILD pysvn-1.9.11.ebuild 1333 BLAKE2B 3b513477fc08b0d57b6640eeecc54c33ec7251d89755c6f5254016f6743fe20d3a2511b25b13334fc3917d95fb5344710fb2e16f7cb6efd2e68a53b33c36867d SHA512 9475445c90566962d9aa556efcca6747915d03d0cdf269ceeff90be956a681c588311a3986411d75ce4167d42fe026b1042a91ac304a566f5583808416795de9
+EBUILD pysvn-1.9.11.ebuild 1332 BLAKE2B 277ba7736387fbf3791c6d5121517c5d90c2b07dc26ce5e31a5c7cee1e60f0ab699ff8d5f78aaa64c3331d2af6d0c40302b8abcff6da0d1fe25eff1cdb1ce800 SHA512 beb70a95693a4c6b3338e2152d24183326030173d18a4e514d1b2e6fda4e6d84cadc3ff29f4ff97ba422bd156f13d78a42d0289f044cb3a33d33ae974a984f30
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/pysvn-1.9.11.ebuild b/dev-python/pysvn/pysvn-1.9.11.ebuild
index 6c55d71a24b8..454f432fbf69 100644
--- a/dev-python/pysvn/pysvn-1.9.11.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 792fb5c52e29..732f813d0e97 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,5 +2,5 @@ AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619
 AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
 AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.8.1.ebuild 1386 BLAKE2B 95a410b7aff0ac1087971dd51ccbef8c4e2b604a59b8dff5d2ac982e9318c68efecc79503fc5e4e059ff59ef11a6bf0f07371c993137e8daa12e96d1fb8ed9b8 SHA512 3dad902e047cbfd5eed0afeb4bb7b0511fca8314e525543db9ea27fb1f8d8d68da8de4310fcd8eb5be9f58e3b14c92d0c7a130f2eec8216d1ca9c85509a5f816
+EBUILD pytest-cov-2.8.1.ebuild 1385 BLAKE2B 5b812da49639f40f71f5968050ecccaa3c3e154b4ce96a129e0b46404bb13c84c0f8dcbd41a80a28060b80fea128fed29c2e562c7b800ac8e109bb4080c64d8c SHA512 dca4399dad56456a3154ffb13f3a969d7d14ed57a61ed3b481189f6128636697672a44190c6cb74f2c96a9c94ec9ccf4df23e87b2a8b04642c90669911cfec65
 MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
index 788897781d00..9bf837927521 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-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/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index bb15c23832da..46adf610bf04 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.7.0-r1.ebuild 837 BLAKE2B dd80406b0b4c2da880cfe51f6867e77462b5ebf96e2bae41d0203b0c0ea0df9b14952aa15a993b6acae4f5ff2f653c0939cf149a437de5222e21e58be26e56be SHA512 454c21c2877e5adb3e7c90dc0aa88a8b6dce30fad66890fc2e031ba3dbe268f8a635f5ba146c6b271d67161efa50dd7e2f76da82198983fc8d7319e91fafc37a
-EBUILD pytest-fixture-config-1.7.0.ebuild 706 BLAKE2B ffa89e3d125e0213c2cd2550dab4c4ed3cda390ab6ff2efeb519cebdff802d8a9c15d6a566d1f18b0ece58b5e56d3155981b9a236b70468435bfa48d32d075ad SHA512 2edead053e064e6699d7de32499a873ca3d796d257d816fa4f1302dcb29cf3332779b09cf4bc556c4166e2374be4ab4a6b046f1b45b41ce1665266bf8a56c06b
-MISC metadata.xml 675 BLAKE2B 37f884705624bee2363674ce33778622a6c981884d3d338363356da21b6c020c9e502000142fb5c3e40f1ee079f3f7b21ef4190bc53c2d47a8bfa5ff5dd6b836 SHA512 3b2df9868df4576b9217da02a7e5a2ea4f57b6032a56e5d05aa9bfe3e734f614a6a676f3a9a1097a778943a05f13231d452a931c51ae2c18cac1813eed692f96
+EBUILD pytest-fixture-config-1.7.0-r1.ebuild 840 BLAKE2B ec5f331940f164bba0e335436a9b0023cf39beffbb5b890a8141417f318567c4a2335b2f7f0f1443b83680ae13f3c3427f5039e3ca0487e314cb31365904111e SHA512 52467291e2359f09bfccff78e7ef23d0fc4437ec6cac8753019afe5d43d2b2e68792cba7ff45aa84319a7d875386685552ce4215696f9b53f8c675dc27498dc8
+EBUILD pytest-fixture-config-1.7.0.ebuild 709 BLAKE2B af149d1dd47f5df522ed1681bdad81e4fecaf2a68ec91710a9a77a9240ca23750a553b8b0b4269c68e881da1a90d3fe20d2124e9625ad077a51b23e29b6f81f9 SHA512 77d9560ccf644178ada1b6c6098d30b0ee5a6a75d31428693ddb5018e33e0841c1de29c3f0eceeb3af932bd074c3552538b62d7559afc7e25e576c4b837b9528
+MISC metadata.xml 678 BLAKE2B 9d7e4416bbdafc423e3621840c698db8c0ccacba79340d9c0174301d73bee373dc7aff0e299b0cd787a2813dab517b0bde5f669e5d973eeb2d34a9d6df25d532 SHA512 e65a58f40b53106d63faa1aff2e0ff97e3a184a59294df19346b2c025085395965853794fa90fc7e1d1e8ffcb4b6ea63cdb9fa1f54089adc27158e60eb258416
diff --git a/dev-python/pytest-fixture-config/metadata.xml b/dev-python/pytest-fixture-config/metadata.xml
index 3677d9bd044e..b53238d90319 100644
--- a/dev-python/pytest-fixture-config/metadata.xml
+++ b/dev-python/pytest-fixture-config/metadata.xml
@@ -12,7 +12,7 @@
 			<name>Edward Easton</name>
 		</maintainer>
 		<remote-id type="pypi">pytest-fixture-config</remote-id>
-		<remote-id type="github">manahl/pytest-plugins</remote-id>
+		<remote-id type="github">man-group/pytest-plugins</remote-id>
 	</upstream>
 	<longdescription>
 		Simple configuration objects for Py.test fixtures.  Allows you to skip
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
index dbe95ee084bc..adfb9b03d925 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
index febeb13cd76d..d2db63806a95 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index b7da55f7d344..2d255276feea 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-helpers-namespace-v2019.1.8.tar.gz 10274 BLAKE2B 1d232817e99909738f7f37466ba22fbeadf75f4fbfdd9b61790dd79418bedbce4ee219e5102ee2db1709ba991e323ce6edffc68c4e3a657c58cb628b505de098 SHA512 d5f4db3ece8b0e1719c4d1213a5e07a3c53257b089d3d74f90cf86f21a7951983a95286c7753f5e9486acc7e482d79c2a95d5a7b8eb22e19c7048db99fa3c421
-EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 852 BLAKE2B ac0f5b83d8b475a18f29f1b4e9a6071658bc9fa4d3c1ff07a30fcc21e18aa0a393d439c32b1e0fb1d4123b2c00ed0e4b79669e18da393acb2c59e8d2a7b77363 SHA512 df4030d61568de45a547eca0d8522195e11ca210560567deccb775b6eb35c25b9e5ea13c89ebd481236b01be94e158945cf2341701d7dafe5a38f2a6bb4b9af2
+EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 851 BLAKE2B 47f4e42ea16c1cf252682c5498746a64a9b7df0e7bcb5791f200db15faab2b7ce3ed7034c5d15dbf1bed01734a8205e793b60b30494958420e2203149b5d3fa4 SHA512 7f803ac3e8225276f6d674750ac3bd078f74f94afb736bcafdb92fa189533a249a6c6745d4ad06eb669c2aef01c4607719edb600110fd9075b25cd051623f76c
 MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
index ba5ee9c82f29..dd13eeec0112 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 2cac46909392..b660005fa947 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-salt-2019.2.1.post1.tar.gz 63824 BLAKE2B 684e1dee6df8f7459bfa1747ea017973d72bc69b87d22c65509ecada47469a94ce410034004a5df1396d5ed05557ddec90e34cb18792235babb5e0cf6d72d776 SHA512 7b9939c3bd1cbcb6d6d0b086c39e02deadd8b3c6fcc359924af7fa5afc2e443b927269b82aa5575413e4e6bbc052f4035fb17ab68dac59ea309320c0a647d36d
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
 EBUILD pytest-salt-2019.2.1_p1.ebuild 578 BLAKE2B a1535a842ab15429175c931ed36342041b9061cd42730df43639928b0b0122fe209ed2b34b397f5f11e8b98f15233cf51ea6d13dd959b20fa839e25a3ff62af9 SHA512 a984989a933648f8183257b0d69438171691beeacef2158e8b876ad76ae3239308dd1061e5a4143e09714825e36eedc883dca3e179fde5599baa586af1749026
-EBUILD pytest-salt-2020.1.27.ebuild 925 BLAKE2B 4cab63b84ac898aa0b5a1fff0de7378c07c23f8601ff651b468960175b30eb7da421952f16bc1a661b861715c0c4b878489ddf156af80216afdcea78d9b46565 SHA512 e5c8a5a53db2cf0945d1e8fbfe1216dbe0c91c73c95f12c5bec67ad5dccc87c23768f61c90fd1f4084e00ff448d80af56b0dd7574877b2ee5b3f5c173b681c84
+EBUILD pytest-salt-2020.1.27.ebuild 924 BLAKE2B 128f25dfc97d5ed21b967930ae5a76fd658fb5108e67c8a542d5370ff015b380ed1006ec9d1912d3628c6c98a7b7119f0c105effdf5aed1d893e56e007adc10c SHA512 ba6ea8facb8cae730d2693e3e3970263c5f2aab06fb2155ec417f665ad865a163a922e90f976e7995cd2c403437c97dd5fa6092fff52f07075b8b620a6c6c914
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild
index fdbdf93cc22f..5cac5c954253 100644
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 2e83ecdffc7a..90ec5d8d0513 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,7 @@
 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 1231 BLAKE2B 3e19845e27d5a32ba284ee385dad4a0131ffcb550744483a3b18698e068da5a5dbc8506006d3e9824593f2069af2203aa54d0cdee2fa1807fa0853f3b6492b06 SHA512 337a4a26ad1216749aa9fe81e4ed2acfb96e0967cb301298f0301cd10f1e35bd4d0d4d45c84b6dd08cf0f750176ef6b693d06ec6ac92e42dafa9d111d77b00a0
+DIST pytest-services-2.1.0.tar.gz 20552 BLAKE2B 6359c419591efed553e095e267c24f78f36b152f0eefe21d46742f7c15f05e92a9e86891f99762a3716fef5284b00d07d8d6eb825008dbbbf07e36dc62a7a6b4 SHA512 54a487546a2af7996acdbcd63bfc01626832aa41683617cdd345453cf6518afdf03cb8c2465e1f5d28c88b2cc801ffb0d9d4440582865f899e21fe42ab431ebc
+EBUILD pytest-services-2.0.1.ebuild 1230 BLAKE2B 5e7b007cd22490b6ef8790651ffe1bfe2b4fd6cd9378541fa8fee3df3955267040296a842339491bf8b915af7daaa2b89dce38ecbfd73fc4f7c270c58ffd57b0 SHA512 f1e5970a319ac54f3b5b7a19197258a1efa590acd6fc170a71f15a868216a2e2b2761d8fdf65ea059a7495656e8ca30410475f13e66d6101c0168042e0dd4e98
+EBUILD pytest-services-2.1.0.ebuild 1230 BLAKE2B 5e7b007cd22490b6ef8790651ffe1bfe2b4fd6cd9378541fa8fee3df3955267040296a842339491bf8b915af7daaa2b89dce38ecbfd73fc4f7c270c58ffd57b0 SHA512 f1e5970a319ac54f3b5b7a19197258a1efa590acd6fc170a71f15a868216a2e2b2761d8fdf65ea059a7495656e8ca30410475f13e66d6101c0168042e0dd4e98
 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 a2eec91512b4..60d08abcefa8 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.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/pytest-services/pytest-services-2.1.0.ebuild b/dev-python/pytest-services/pytest-services-2.1.0.ebuild
new file mode 100644
index 000000000000..60d08abcefa8
--- /dev/null
+++ b/dev-python/pytest-services/pytest-services-2.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-services"
+SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	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 )"
+
+PATCHES=(
+	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
+	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index f1718bcdb149..9c62c697d079 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.2.11.ebuild 1046 BLAKE2B 13bc77397a8c9c3b90d8c170d151f5f92cef32e60c5ee814351d29baa3098ece9e84a345c417bf9719efa10e975bb2038e8d02fc36fc70aa952912e64ffc7ace SHA512 fc3eba98d9e9e770944baf8e06c4f3927973727a7989313b927785bb6b7a73ac35e1792ebd4a62f3a652a1e373410dec1ea608c8df92173dc0716104f6b269f5
 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
+MISC metadata.xml 708 BLAKE2B b8d9f61638c355a67e3f59b91a61190f334a8cb38e16cec988b54cced0028a4b7d730575eed93a0f562b3d86a4e5610fc750734746b7f86ad685e957703c4121 SHA512 ae58ff809ae82cde03544ccabbff1e866dedaa777afa74ff50d757babd8d95da0f7448e15b53f7754c182b8dc62e17e0fa8bfdc2e6664c8b6c2481b77d59ab48
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
index ba66a4a08b73..5b33c8e6cf95 100644
--- a/dev-python/pytest-shutil/metadata.xml
+++ b/dev-python/pytest-shutil/metadata.xml
@@ -11,7 +11,7 @@
 			<name>Edward Easton</name>
 		</maintainer>
 		<remote-id type="pypi">pytest-shutil</remote-id>
-		<remote-id type="github">manahl/pytest-plugins</remote-id>
+		<remote-id type="github">man-group/pytest-plugins</remote-id>
 	</upstream>
 	<longdescription>
 		This library is a goodie-bag of Unix shell and environment management
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index 8d022a92899c..b4eecc6c24f3 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil/"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index d53b540f9baf..588651879dbd 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
-EBUILD pytest-tempdir-2019.10.12.ebuild 668 BLAKE2B 0fabfe016168cc21fc8dc314e090098365efd78ca309de50cf46a0b7e6ca5083b30ca83a3938825f28037cad9f77190c8096aba0f3536bb5f859af5481910528 SHA512 cd987bb678b6c91021b381c5791f03d4ac4f6cd189cb20ef7edbfb4db6b507972790acf5f7303edcf4a290b40af6a6169b8b1b24f803794dcb39c925918b1f31
+EBUILD pytest-tempdir-2019.10.12.ebuild 667 BLAKE2B b2c3f1e652f9a21e873fed2f6dcc9dc3bf6c03a32c786e045370dae5a7de4683710d6c04f60063a0686e0b82be1c803289efd8e5f1e555a70dfcacc9b05a30fb SHA512 213cf646cb7f5d91e2fa2aa34e815fc4a0e54fce3ed2f04d3f304055ef832ac41e5fb7cd2b964207e098059a521ebb9169a2390586791880fe77295f400eb83f
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
index aeb2f98183ac..7ea0a4c86465 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index a4c7e6b53e57..6a6143854b1e 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,6 +1,10 @@
 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
+DIST pytest-timeout-1.4.0.tar.gz 13661 BLAKE2B d55cf85e44da1e8216d28d08c6783e720a37dbc4bed58c82a24918ac471e8d66f33967f16a249aa5307d0e227082e5628c06041b1bbd12e251a97449c69e5cb5 SHA512 457e30c0746e2762f4a62b0cdbad4f7ca4514175d97daa97fdbb1ebab8743085e828336f137a9cc7dc655c0827c038177195b589ed531d81bb911b6e5e5c875d
+DIST pytest-timeout-1.4.1.tar.gz 13804 BLAKE2B 45e9bdf6eb39e706cac2c9484cd34a9f16096d71d0146251bef9591c35c269043c95e641bed40b25e3d2076fe29a5782363bf9130b331eb04c4e867b1e8f646b SHA512 b62b090365c1cfe1a4d544b5645f828e451ec5229313c50a26ce04ba6cb203ff9ab487c61fb000af342f3d499e11f67aff5f84ff5b00328a129f1f39d4aabf28
 EBUILD pytest-timeout-1.3.3.ebuild 741 BLAKE2B e3408a045aa7dfcb9e3e752c413a257cb57c9f3e7f4d2b12ac120ce0fee057e0f481ed09b83bac86a005587a96e4140305af98b95048ac3292bb3c42c238d4fb SHA512 7d589a28ee3ed5b286ad0fd4d0e1eac46f1236631f69c868576f182f6281475243981c31a828d1190605bdee5a5c25143e31f42f8c4daee810ed1594b187c275
 EBUILD pytest-timeout-1.3.4.ebuild 760 BLAKE2B 1d66d2e4880ba14a840f920e0b36d4d2ebdbfe4a06b70eb4d57746c522674499704c1b201d0a8e8e49a1cc1090c19d155ccd1ffc887793e06926f23e07b28df9 SHA512 5b273c35f9bb2a9999c0b6a951d4ce31cc21a3a6218a89c4d6e7bfca0cbfa3603ac42e9910ddd3819f136ebb73b5492fb398dfee4be554335e3a23982085ee4d
+EBUILD pytest-timeout-1.4.0.ebuild 760 BLAKE2B 1d66d2e4880ba14a840f920e0b36d4d2ebdbfe4a06b70eb4d57746c522674499704c1b201d0a8e8e49a1cc1090c19d155ccd1ffc887793e06926f23e07b28df9 SHA512 5b273c35f9bb2a9999c0b6a951d4ce31cc21a3a6218a89c4d6e7bfca0cbfa3603ac42e9910ddd3819f136ebb73b5492fb398dfee4be554335e3a23982085ee4d
+EBUILD pytest-timeout-1.4.1.ebuild 842 BLAKE2B 89f6b0a532534d54dab1fd9b6e51fafc7ddc4774f44d2c10d2f830a1dd9b68f37b77c8663f955be6e719491f1cc7aa79eb9c782a89cf91a22a337381e838577c SHA512 213ddf28bdf2b7fbe831ea17c1f2e0b1f397f35acc7c95085d2e58058318d92cb6c03cba18bd67cc77ef4bef96f5568d1104b4fca7f705ac5adc14b012fff0f9
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.0.ebuild
new file mode 100644
index 000000000000..7b3e50afe479
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to abort hanging tests"
+HOMEPAGE="https://pypi.org/project/pytest-timeout/"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild
new file mode 100644
index 000000000000..acb582e46efc
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to abort hanging tests"
+HOMEPAGE="https://pypi.org/project/pytest-timeout/"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+# pytest-cov used to test compatibility
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index edbdc6e1cedb..fdffc20ac54a 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -7,5 +7,5 @@ DIST pytest-xdist-1.32.0.tar.gz 67733 BLAKE2B da0ce4e43dc8752e4329ddcbc13a5f55f5
 EBUILD pytest-xdist-1.23.2.ebuild 1038 BLAKE2B 1d3b0a9b09b92c4ca54420f8c080a84c975e070e8195243659bde9dd4de01641fbd702ac00b059edd90c430e503b976a8e228457d630dae827298c2b8cc6bbd1 SHA512 c49f37f82f8167652b5a354be76e05be6b6cf378af707ae5a3ff1b1bdd0ed6366c682f09062118443264324faa4eafa3b7f131668eb9180a8708cfd25d92f546
 EBUILD pytest-xdist-1.28.0.ebuild 992 BLAKE2B 1e550a1cb605b0d0df688f89271ea05ceddcd33b8079fe9dfe239cfe66d7c856cc45f81237bca814ad1c44e605b2f111b7fd2e45ed80b5e4a95335ece97b3b90 SHA512 0b894d560dbdfa1deb8f8580d21958af57b1f2107caae0849353202ec622d5c0ab0055f803357c9c11169edf7e85e1914546e0f7e4b82c1d11d5ea1666aee3f4
 EBUILD pytest-xdist-1.31.0.ebuild 951 BLAKE2B f19b0849f99675e4f6b151f5bc2d7364d10f399e7bd14f0200592ba8e1a75ec91a7cd74632140c3ad1f490b32af940bcf6963d4f9aca0b0521075eb050edefb0 SHA512 cd6524fcd8d023928e6d64f8d89828158841463f5fdf528905b88a2aa022609a33553d3721792939bcfcc8e85eb3b281637bc4f494b262229d1b2e092cdd4e50
-EBUILD pytest-xdist-1.32.0.ebuild 1022 BLAKE2B c826d5f8b7914a85bbef939545ce36b2f86895e5e6df30d34cd83bf151dd786132bf287643297cbc3166c3ff69e36a2a27c1fe5f3ab49edb258fcdcf7a525005 SHA512 8aab8e35417f1fd0840756f9c4228fc9235ac9a74c4acf73eb9d74f1c32cb9f43b52a6a5cdd276ac8093cbcd9a0447aba416d41282ce6173a231acf49fc327ca
+EBUILD pytest-xdist-1.32.0.ebuild 1028 BLAKE2B b097cb41d9f2cbb02f85e128b139a93410ad87ebe1712677b9e9578733c4d4a7230ef443f82089df972fe0a98383e4c3fb131f59f74021c6ffd95d9a79123c88 SHA512 e1bc7e10673f5bb8904186bc4893187e12c8a20dd5b06bc4b0b61cb8dcd43ee804912a1b41dd03239b52f3ac3fc110e14b87e97824e72013a62eb90758e20913
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
index 03cf9a9d3fb2..8ff5690847c6 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.32.0.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 ~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/pytest/Manifest b/dev-python/pytest/Manifest
index b992ee775fab..4b0faf14a5bf 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -11,7 +11,7 @@ DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a
 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.11.ebuild 2483 BLAKE2B 6ea7340e10caaeeae52dfa5f041ba93bc277b738dddfe863922a134f4e2d71569fb1ad1212aa03aec04e016801a31284bd8057fa158f5cf20a6a4837d67ad504 SHA512 82fe44010587208e774a0c514c00a283a84a42797473defa664d3d512b53fe39c5fc6a1c86b5ca272e6a8c8eee599ae05881706e6e72af1cfb58debe3b2ec946
 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 1938 BLAKE2B 1cae7fb13190416aae69261e71f4c160d56cc92445a1145a2fe2d0c8c9895bd20ea616eadd66fb198faece158c0062d65feebd44ebf7d5971647228079f146a9 SHA512 a0ad4afcbec3cb06460e01db127575b3a20429619acf50e1e567e13a25c60348b70ba2c6bd2726a8c2b23b366b43d7b189e7dc6ff3a49dad8e1d5f5988e399f2
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index f7a45485dc91..916e44f6f36a 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.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 ~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/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 20cb1bb4fdbe..789411044177 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-1.3.0.tar.gz 85018 BLAKE2B ba5c391631ecf8cc0a46f21830209c59b1217940ff25e051e027bc8896d71965a394f222f4e3d629ba2a2f8056ccbdc0dfaf43a37684d7157c7456d61f2d8314 SHA512 392fb4fabed344e6db4e257d4cfc7043393efda15d940be80b013e4c4e350334148a7b04aa0a7239f824ad2c7e0bb057c5cff1c0f320d30b25b0c9aab65a6891
-EBUILD python-evdev-1.3.0.ebuild 855 BLAKE2B 36ea3dcb162016f603e5cf9c2a3ed708f130483ceab8f90b286de8c80c18db77920dace6e19b5de38aefa35b0664f60fa55f30c5ed861039389462cb34bc0ecc SHA512 8887a9c8d3e9e7623afb2b53ecaedca2485f4742d0cd1f6fc8b654e113357a44835cd9b5f66be9941b83969480dab1e371b03a5f91b30a9be47039128fa6f343
+EBUILD python-evdev-1.3.0.ebuild 779 BLAKE2B bafc19116c0e1dad942f7132af84bfaf13f7ccf2be46c1147057d486199c6c68a585710719185d90ae373baebd53c4fdac03f47cca11189bdc28ca2f96f4eee1 SHA512 3509ade0caaa321a5288757a34d37ac65b98f57d5ad2f9c59dc51985582a45f936005e0ab2aa316acaf45eaf4f62625c08678d2e03c81ae48e4d49b93a705735
 MISC metadata.xml 371 BLAKE2B 88be161b93c99718fbcb9c4dce6c7677c274e61959fdac8eaf7a300d815e630e6d602b5ae691a1fc7153ae9e1361497b87fecf8dbb5e58b079e1136026e005ea SHA512 f9e39269149db9965c94d9ae7bed4c1d74ca210fb33c8cf20ce8b025997727ce2d3ea223ea17b5033ed103452b6b0aa5cbefbc29d2d321ab711348c2dc4e7c7e
diff --git a/dev-python/python-evdev/python-evdev-1.3.0.ebuild b/dev-python/python-evdev/python-evdev-1.3.0.ebuild
index 322655625445..46b1cc4b8467 100644
--- a/dev-python/python-evdev/python-evdev-1.3.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.3.0.ebuild
@@ -26,5 +26,4 @@ python_compile() {
 python_test() {
 	pytest -vv tests/test_ecodes.py || die "ecodes test failed for ${EPYTHON}"
 	pytest -vv tests/test_events.py || die "events test failed for ${EPYTHON}"
-	pytest -vv tests/test_uinput.py || die "uinput test failed foe ${EPYTHON}"
 }
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index acc84ad90572..a8a6ef2cdf25 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-glanceclient-2.16.0.tar.gz 189395 BLAKE2B 9de8b162c1eb5bfb44700f41cbdcd4f8a983d8c7bd7b281df09db67df6a0de5dee905330f03c967be9e1c3b2aaa379e4c8594f7f4cdbb34870a1e87cb7ccaf1f SHA512 b853f529752247873d9f319d4ec6f4cabc89ee4c26a0c1013e7609fc38e3c9f68d774b3682166e8155e21572a0a011eb6859a84c253ca9f7a9b8b1ccf79b5322
+DIST python-glanceclient-2.17.1.tar.gz 189763 BLAKE2B ef085f6e6e0b8d3c79ab3cce95fdef2066a999258e511fe3c5efa9be577990d8381f07929ead4e83d1859f345ea55629ab75f980d04107e41fec192a64c6f055 SHA512 2082112ce01292b232f63a0a8a95d16f209f33db5c9b81ddc912cef2ce378d5f0bc7ea0e039c0608ab382f3e9f6efe020d71e94b5475391c4d41fc1fca45678e
 EBUILD python-glanceclient-2.16.0.ebuild 2006 BLAKE2B d68ce198d7957649f5e6bc5c58e6be0a14a161780d9a3d63e399362cd707a3a22241760306b997547e0dd1474c14bc91a70626929fb903456b1285dde715cd43 SHA512 7de48e04276b2c2fea7efe5a5b9bc1b520231d896b2f42c7456b82b8c87ceb16183b2698f5cfbdcc4f8ddef52a806dbf8862b263eb8fb567d2ed7afab7d11bcb
+EBUILD python-glanceclient-2.17.1.ebuild 1103 BLAKE2B 3275d4f7928135ff0c4a51a98096be02297547ac1e742cbca9398154129dad6c670d083fad724ecca07899b2eb283b443f712e9ae89b7694c9ead50bb9e4d526 SHA512 b4ad474670195a4e94354a05e74ce2d2bc06fd30e99f364bc0178dd874526821027856843245d787aaf6fca6498097eb351bd53a86c4973dc3d8b8a75a37917d
 MISC metadata.xml 530 BLAKE2B 8b986229c3bfbc1b53f64a82ac7dee2928b57d5ef6ea57f2ac46c112e058005d9ce617ea3adb4d8d0df1e43ecc74b3b6d07b675dbbcb96527c7a3139b9790a16 SHA512 369ad6988a7f6c068c62bb5d7139c6bf807ccc29a2d8ec314c8f4156b41690291b7243f4f6562f16aa8733211513838e4916a67fad1cda6d1ed698cbc14b843a
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.17.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.17.1.ebuild
new file mode 100644
index 000000000000..e04d9c12203a
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-2.17.1.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,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+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/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index f8529ef1b21f..7c1785b78289 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-keystoneclient-3.21.0.tar.gz 318108 BLAKE2B 3708b8f464fea1d09edbf7d887bb0a73cb096319c38604381fb60ec33cdb41896a145a5896ff3cc094f055bd30a47e04e30c1238d278edea57e89da8757047f9 SHA512 d705a6183be9cbfb0743da7ef535620e92ea0b4161d87b6c21ef1298ae5cd9e95e280163f286c60565154d22a2374bf5cd3d51f6274e212499e58569dc3a0f55
+DIST python-keystoneclient-4.0.0.tar.gz 313891 BLAKE2B 886f354ea29b4bb8886bde1c337e619403f81ee608079777f1e96bf55e936fb7bef48194d721b14857043e1c878f2f2c925483dc0641bb5c25afd6af1536fce9 SHA512 6c094327b4c8bcb32c42463a3abe412230c514c59a5b45387da99689385780f530669979b6aa06ee03450a1386ff089bfc69c24c625e56ed46ab093e6f58153f
 EBUILD python-keystoneclient-3.21.0.ebuild 1211 BLAKE2B bc26dec4944f7cd78d9aa2c5178ad00f7046b78928c7171f2cb01642782fb64b21354035af97ee8ef660665f4cad1a9621df6354f54f94bc60d10e62fb0ba1f4 SHA512 b5e65f8ce108b98ac075826f80288856dfeeec08729269853b642e5f9ab6e54ff4a1e53fd12f6e1f115404776164648bd55c79f5292811291b1af1772a038fa6
+EBUILD python-keystoneclient-4.0.0.ebuild 1213 BLAKE2B 31c6c90c4911e0cee38ec651d9fb17b86cd94bc2acc3fa873b092b82c347f641c92ac4f2ade96bc25001cf93b1043b8274f2421c714c251c668cfc6dd79b8772 SHA512 a26e14e80cd573af03eda0b0150fd0864f98fe75bea7281a553168e6c3c03fff8867acfe671a6bc0624f57b8deaabefc94db022303bf4bdaee76fa1fe31e3ad4
 MISC metadata.xml 557 BLAKE2B 83a915231d68ba03af636bfafe7a052f567bacf3d746e37093855c78ee1a2bcb11e919924f9aa4a721df0da9b22463ba732de9f9f105cc1ced03bc19ea1fe980 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
new file mode 100644
index 000000000000..623d0b7f54c1
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
@@ -0,0 +1,43 @@
+# 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="Client Library for OpenStack Identity"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test"
+
+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/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.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/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 948a76b5da75..dfd527c5ef8c 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,7 @@
 DIST python-novaclient-13.0.2.tar.gz 312390 BLAKE2B 2a436a2f843afe466bbf3d376d16a994f25e2232dfcb67271837159c5f21d7970027ad6d946c331dd6bff5c248d6b526303205a96a18ef4872cc8b1b526ff366 SHA512 988264cb6b6034dd0c4cb3a79840f591bda9c1c0134ddf0124beea6d9992192dbaeb9ec20bbe73f5a831bf561d175fd3d312880093f58de51d326922502cd1e5
+DIST python-novaclient-15.1.1.tar.gz 323657 BLAKE2B 63f213a3710beaeda477a858164187ff1e48dbdeab5fefd3192cb4c7799461cb13d2fe82624661b21b4f51ba07b138929842a2aa87bcac568f955e41ff3350a1 SHA512 9024deb1036778030977689824d089eeb4a1fa60a7cc3f1f156c9ae8ff03e84330d90092f55d45853ff6e522d83b6e097b6c566f1ca1cdc6896e47183c2efcaa
+DIST python-novaclient-17.0.0.tar.gz 325548 BLAKE2B f34bb6cb2cbb7f65f81ef410828b9c3a14b67bc4558f0175b4c9b66899c192367637d281d86f5e1a7267c2288930845f22fb389244839c2dfa76fc9a58bf3480 SHA512 4f8a789364f4a6603c67236fb61ef1ca2aabbc8e18d96d5890af137cc6d2d06c250a5202aa91c95432686ce7b5ffba8e31cc38b43032ae2420c08381751d3332
 EBUILD python-novaclient-13.0.2.ebuild 2375 BLAKE2B ff78aaa836cbf67d080e5c0cb07885651da984846a9433bc833b34eff5dfe322a47a7d4a6568cf45bde23cda0edd5c8eb02e85b20e06b874f58d0bdf78ab37f7 SHA512 299c4e06fb00c39a7e3c64029600c728d5306ecd9951340853cf8cfa7122b24662cb4fa8d56780469e8bdf6e28ed1232ff210264e9098484f7bcbb49448410a2
+EBUILD python-novaclient-15.1.1.ebuild 1254 BLAKE2B 842c14fb32e4df10e18fc437a57c85b93f8e10a4340c302741660c60f933a8ae4549a2c3c74cd5ef507b08b54377d6868c20941513799fdd78d8fe02fed65518 SHA512 5ae97ffe3fbb7e9f05690f8b378e80eabe508dc28d26a40ac341f55fc88199f9996e1fd7179e5819c43861aa7948a33f52c66169d3aada2643a669b84b84b33a
+EBUILD python-novaclient-17.0.0.ebuild 1211 BLAKE2B 14569279d7e79b9e5613e997dc64a63583e44c3057bffcea468d839baa9e279cb9582e7ee23318bd91dce8678344ae9310fe6b528f2d21c8720eeb5f613b605c SHA512 98b3a63b44849c0a635ddc9ab37125a76fb4b116f8c9aee5ce64e0d94c5483b5d8c716047c2116567958f44d046ed0ed810dc0b3d9e0eed129e79800ae8620bf
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-15.1.1.ebuild b/dev-python/python-novaclient/python-novaclient-15.1.1.ebuild
new file mode 100644
index 000000000000..fa8dc2ac6d01
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-15.1.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
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild
new file mode 100644
index 000000000000..b880671a1a2b
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-17.0.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,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index ec0b364641a9..0fd3b068b5a6 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-openstackclient-3.18.1.tar.gz 721120 BLAKE2B 58394b6172f6bdbe2ebe5a1d8ea2209049887eb7cca635b9b87b558e6ffeb7130c2545aa8b3bd11d8f8b1cb6c315acecc5fdfa7dba21c2442ef049ed688af546 SHA512 2fb15e2c9d3daa9e70871ba2005d2e94be975b564e1f70690e8a5b2fc4cbfebef4870bb39d8099829968e05eae356f4f38edad154ff041d8ab20fe2ab68f2bf1
+DIST python-openstackclient-5.2.1.tar.gz 722343 BLAKE2B 894424f8ce8a7d0489df4ca6c4d811f489f7ae4a0933b9e0a7ff30c0bfaba8bbf783d56376de655c6cc2fece28b032063f6cddb330353f3dd78c44584061c236 SHA512 74abb72435e95070e2d9a849def79ef56a4afbf9473cf29053af3cc65ab5d936fe0c542ae9240ffd5b801964f17c9a65af8f4770c49606c180e4eef25e73c26c
 EBUILD python-openstackclient-3.18.1.ebuild 1282 BLAKE2B 7b3d5bff111a9fb0e00d702a844439faec00d7015d5a1a1ba87efebf4ee851c7ab7a7c9e4ed45bac715b4d9d544d6d5aee6da07638b2651d62c09ef9338689eb SHA512 03ed2e9bfaa50e852b2e497bc2d27909a2ddfdbbc5f60a0dbc113e409c6189966a54a98516c93b1a7636d9c969d33c81e3ba62be20409862d62139a88ef9018d
-MISC metadata.xml 632 BLAKE2B 4e989558d44ee733b380fae3f269ec9ca0c511caa1fd8259cac90dd3ded82f4137444f32801efd2440da95b98c2864509c5068432de830591ccaed2072029c91 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c
+EBUILD python-openstackclient-5.2.1.ebuild 1174 BLAKE2B 47561d8eb50667f62b38148a51f515ad31a7e12a9d9d08c779f3acc59104ac6836b29b0a6e74a327a518aed35d5501f5ba5bf959326737a8fcf8aaacdc81dcdd SHA512 d40f6ada315bf41ab3ac0247ecf1b3f45ded7d3aa312a3e04a5d61bc6775593633aeb79fd22ff82b9f0396a73c91feeb6b6918ac4b8e6ae9fe963c5b4df3fc38
+MISC metadata.xml 536 BLAKE2B c76563d24c7dafcfc12b46ef9864a6e5fda3e65b0fa37b5deaef04ec8f870134e9e22c248e9c005d32a35465d2d16aed0b2f98c6c6058b42e5e10f080b8d751e SHA512 f9ead8f5d15828f9660287f651e4a0e1fc1e5442cd00e6830126af05021b2f23f5d419559ac72d5befb2cf3838a90ed5f8c90be5e41f2941e0b6cac15f0169d5
diff --git a/dev-python/python-openstackclient/metadata.xml b/dev-python/python-openstackclient/metadata.xml
index 4f42e4205fa0..72295857a915 100644
--- a/dev-python/python-openstackclient/metadata.xml
+++ b/dev-python/python-openstackclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client for the OpenStack APIs.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-openstackclient</remote-id>
     <remote-id type="github">openstack/python-openstackclient</remote-id>
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild
new file mode 100644
index 000000000000..9cc9b5bac881
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-5.2.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
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+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/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.36.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 657da06434a9..044c95789068 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,3 +1,3 @@
 DIST python-poppler-qt5-0.75.0.tar.gz 23281 BLAKE2B 06b2b0899d2a3cfc84e623b98cc3379aa45ac9ca9267f25168cce04f2ed761fd897043376fda3386b2daff2b46850b24782cafd6aabb13a8e7d6f3920b55a02c SHA512 2f03036a2eaeb8e28875f19a813ff85a91c1e9a94301bdb736ecc50e7ececb4de2622728e6fecbf64e114435529f82b6afd23d772e2d3910ae03d5d2b5da3205
-EBUILD python-poppler-qt5-0.75.0.ebuild 545 BLAKE2B 3ddc92e45b7f36725c7cdb54f0466edbe1871790e2e4c5206a5ee6c1ab66bd37247b7c73c308f6e820bc47d7d625f08b0ad3da4b0845a72ae26e1f69af5b74a3 SHA512 94d5a30a6d513bb3313704633b06da97fe73d0f6b7afc19f67e5fb7b6c769c240e03f768e607684960caa4f56b7c49ff313dc77f5580be73d780fd9f4c279b61
-MISC metadata.xml 330 BLAKE2B 8ec299c2f0c45f1e6f1c0da00c43ea51ae4b93117b5c1fa29d31692e8b7b553c9f977f54bc379fd01addcd682a2a357670696972e953410972d1cafa670cc1cf SHA512 5ceefef72bdb03860d693c39df292964f2a81f477a872541ec2430062cadd5ec945c9e60ae7b157bdfea804016d3d5aae1ccd19c6fa75a3a86bd9ce3e4f30f14
+EBUILD python-poppler-qt5-0.75.0.ebuild 555 BLAKE2B fb77a00c55ae8ba813ae43789a4cd277381274b6ecd8cec3851f59c8c35b7d57424520dacb72c8f3ac2a75803725ea8d35437dd9d0c8129b669f18f63218540d SHA512 f2937553bbace634cf7c02ffad905dae751425928ef18171c1305d51fde41af686f3682be0fd73d204c78d7d8549e9629c7ebf5748cec26c1194b07b9caa4353
+MISC metadata.xml 335 BLAKE2B 41edd46a0432461f40c7fedd8dfa8be8e98d3b68a4fd1be16cb5cd4cf5959774176ee262f6245e09f0a1728a54090d8510a8f1adeb480e43a25c6b21fd33b920 SHA512 72c4753af138508ffb54b174c656a0d5d9ec6b77661af81b0f27214e85570a7011efb5acb85350cf0423c24ca25a0b49264d6f2aa8ce26e07c3be477c854b1d0
diff --git a/dev-python/python-poppler-qt5/metadata.xml b/dev-python/python-poppler-qt5/metadata.xml
index 6154aff3c15e..37ebb55340a7 100644
--- a/dev-python/python-poppler-qt5/metadata.xml
+++ b/dev-python/python-poppler-qt5/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">wbsoft/python-poppler-qt5</remote-id>
+		<remote-id type="github">frescobaldi/python-poppler-qt5</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
index c183da8607fa..966751ccba3f 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python binding for libpoppler-qt5"
-HOMEPAGE="https://github.com/wbsoft/python-poppler-qt5"
-SRC_URI="https://github.com/wbsoft/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/frescobaldi/python-poppler-qt5"
+SRC_URI="https://github.com/frescobaldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
index a2a211531a5e..7cb85a53837f 100644
--- a/dev-python/python-redmine/Manifest
+++ b/dev-python/python-redmine/Manifest
@@ -1,3 +1,3 @@
-DIST python-redmine-2.0.2.tar.gz 559017 BLAKE2B 3bec44ec562f524f7f9b4903e51c1ecaf1f9c7d76e7bbdcd6edd95e7477e9038011336514ea5f75ec23880469331ec5a8b5417d44d032d7440234db1e7bf59ca SHA512 3f8e11315e8e2b4474e8b981bd801ef75857fe73e8ed18d27f64223703d18ea2061416ed38ea35c4a4460a4ccba167b41ab48e2489930181951e9e2a5f53ec12
-EBUILD python-redmine-2.0.2.ebuild 906 BLAKE2B 063868e8683617a2acab0575cf9bfabc26e691f4f7cff9a863264d6fc6ab5f86f34caacb7de3c44e84acfb9691412daa01d26a418f8ed89e203a2376e5c7e300 SHA512 ae0f7b365f4b4eb972081b0e0c99dc19fa5be28ef105d2a3ffdc2a45a1ebbf4d11567236a0171a7d5150acce758777fdf11d7aa37ff45dc39348ca8b1f33d3ae
+DIST python-redmine-2.3.0.tar.gz 67915 BLAKE2B ad31d63ec5bebd33ff436f04c40fd49e35a79751c353ba1e343bbb03048c2d1662ec8ffea5819561b675e366f8cbad48a0e0a0a59dcaa563a90301ad4f1eb1cf SHA512 a317743a561cde65c17356a317d3aed082149d648aaa7487858c8533ceb286d08b6610d742321f6593fef8b61b1a4526963ddffc4ab180a83795d66773154b70
+EBUILD python-redmine-2.3.0.ebuild 473 BLAKE2B 16f551d804516563452c06c14c7363e71215fba691dc71eabdaebce599d8eaf5f3d57c2121d3e7b65433d9c49d680f8f916159705902298e2e39f3316d0c60c1 SHA512 0215667a40d27cf3d354cd90dc52d80bc58aa06a5f3c0383d92efe114e53427c39e8f8643101666253f51415bd592fdd98b14ab4c5c4ef445e20ebf40ca5932b
 MISC metadata.xml 400 BLAKE2B 03f628bb2d3dc4fe61613c08dff75e0534c475d637150a9c895e23e613b5c32188f78b298fb1b754d0df6e617f5d7c28e5e20f1984fe297a6d550b2debfe290b SHA512 12d43f2ec4712a7c01ed86aa2b1d05eebb907a8a6bd787ec82aff8ea2a97cc6708255dfad3d386550bcc72887d1b273b6ff3f958bc22e5bbdc4bd8a8d28a57ac
diff --git a/dev-python/python-redmine/python-redmine-2.0.2.ebuild b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
deleted file mode 100644
index 403396ebdefe..000000000000
--- a/dev-python/python-redmine/python-redmine-2.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to the Redmine REST API"
-HOMEPAGE="https://github.com/maxtepkeev/python-redmine"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Remove the bundled copy of dev-python/requests...
-	rm -r redminelib/packages/requests \
-		|| die 'failed to remove the bundled copy of dev-python/requests'
-
-	# and replace its local import statement with a global one.
-	sed -i redminelib/packages/__init__.py \
-		-e 's/from . import requests/import requests/' \
-		|| die 'failed to replace the dev-python/requests library import'
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-redmine/python-redmine-2.3.0.ebuild b/dev-python/python-redmine/python-redmine-2.3.0.ebuild
new file mode 100644
index 000000000000..493cc6814736
--- /dev/null
+++ b/dev-python/python-redmine/python-redmine-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# 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="Python interface to the Redmine REST API"
+HOMEPAGE="https://github.com/maxtepkeev/python-redmine"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-2.23.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests nose
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index c8ed4f252bc2..3f212ff7f63c 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,3 +1,5 @@
 DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc6224a2ac1e17ce21230ed684af144c0f72ad99b32674bf19bd716d2cfc3a2f0da6f74facc99acba16e3ebc1873f3f3 SHA512 ad45958d03892d8db75967b150f25509c05ab2a87d5ac4a2ed12fccccfe1f86d7db26c406c6de22ba759b77fe772cc0c00d0e517c71db085618f62094ddadfd2
-EBUILD python-slugify-1.2.6.ebuild 592 BLAKE2B 20da089bedc34e9c79c988035fb404624661eb730344293006f27c5e2c1b1df2a7d36dbe5640375fe8acfc43b59e11e5857ec601f5edf55ddbf457a169d59305 SHA512 a62b3eb4933fedf0456c5a94db14d4cc5076b51eb11f4a99b9a6dfbbb5792068d8bac92c913f23157a1ef42f80672d93389a1b480ce7fd058d70a22648298f7a
-MISC metadata.xml 503 BLAKE2B 57ca9410de0bb0833413a7005395601ecc9cc74f612f0bc0584e2c686a4df9b7477f057e17a567e360e7a70abc7ec82955a947972120f6637089780712ffbe23 SHA512 62a7512dc2ad3baaba77ade0fd6a22046cd6e950c340850a7e027ceda1d85eff063ec87427fe744369656703449d2670ea6c8f555d27bace6c330d00aabd4651
+DIST python-slugify-4.0.0.tar.gz 9391 BLAKE2B 386e0186f9300bd00098ee534c5c5521b04b087e17a2530501291c17884c5ceb4895aa357dc0d4b573ba39aeaf4a69f60e2c110b3efede0e066f70ed9992f5f7 SHA512 a4b0da48ee887a24a022076c9b21fa5795ab104b1d382bae96fc7ba5ce6c09c0cc42e1f4c3b6874b44097d2246ea5b18302dc42386d8844fa41f495744e5ed90
+EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 6cc4442f9861783a0b0927f675ec661e6344ef2c801c911f22c187ef8102670a4ae8ba71cde81646ceb7a2d7b96849e24822e9e7104bf15d3ad297265b21def4 SHA512 3a4e137e8073c476c7f0418b057ce50cd829cd9fd59973e5986faea0897838fd769c96bc815cd5dc5d5194bfbcf17ef1bb2b6ffe756e697fb58e27f49e87fd5f
+EBUILD python-slugify-4.0.0.ebuild 578 BLAKE2B dd9aecc487b38472b5940415ee7c07a314d7396c52f42c2f6727bfb845a0493a9534bf7ab86dabecc9a7ec7d016130fa95cb88d8771911d05e99c2eaca7b2e77 SHA512 24c8d1c8014725956579414c06100de83985464a2158b37e523ead7148e0ce46c9233d45c48758a2af2e2510f261b90f644cfaeb8e40628417fd1e4061b93879
+MISC metadata.xml 582 BLAKE2B aec9e0c331eb3b395607d2de104195cf7c6bbd88f3546420844ddd30407fa78ecfb6eb207ea208d910ec280441aac8c578b94a5cff71adede454e04f55ae60b3 SHA512 95eaa04f1332aa04a3f20e6e6d0ab4f8f86a8532d35c3e8059732febac20c8157c017d66abd1fc70b75e1f069b9ac90aa6ce64851923bd8db9efb1c219ebcb1d
diff --git a/dev-python/python-slugify/metadata.xml b/dev-python/python-slugify/metadata.xml
index 8ba37583de7b..25f373941294 100644
--- a/dev-python/python-slugify/metadata.xml
+++ b/dev-python/python-slugify/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-slugify</remote-id>
 		<remote-id type="github">un33k/python-slugify</remote-id>
diff --git a/dev-python/python-slugify/python-slugify-1.2.6.ebuild b/dev-python/python-slugify/python-slugify-1.2.6.ebuild
index 569e6c07989d..caa392833c73 100644
--- a/dev-python/python-slugify/python-slugify-1.2.6.ebuild
+++ b/dev-python/python-slugify/python-slugify-1.2.6.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/python-slugify/python-slugify-4.0.0.ebuild b/dev-python/python-slugify/python-slugify-4.0.0.ebuild
new file mode 100644
index 000000000000..979461ce2cee
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-4.0.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
+SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-urljr/Manifest b/dev-python/python-urljr/Manifest
deleted file mode 100644
index 87b354761126..000000000000
--- a/dev-python/python-urljr/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-urljr-1.0.1-gentoo-test_fetchers.patch 540 BLAKE2B 66d9ca4c965f900a7d02d4b934dae1ec5d402975bdef7afa9db7a7a28b232aaec25a66e3d4f0d260249446d692af31054480ef16a3873d47a5668fe92e6a8a5f SHA512 bb07e8adabdc9d03265d2f651c5c02d62227dddd85905daacc9986f119a7ea7db2743242d79df8cfc35f44ab1f90cbe9199c6457b110d97a8861d84aa92e5365
-DIST python-urljr-1.0.1.tar.gz 16570 BLAKE2B c1eab9bdda42a670b6c58fc21280c9904b6cf4786440b33693eb4154f6492f8f9438b2f88bbfce724281c51a7270707cfc948da7d35192cebc2f9b904540810c SHA512 fff9e5f557ff8fa88e122f535134320043f9a14fd8048234bef762af666f4c088d50c6bc8dd3d173154e80eb8e076f0fb6749e39dd9c6f88c7ab763314dad0ad
-EBUILD python-urljr-1.0.1-r1.ebuild 754 BLAKE2B 126b0b56fc8183b27c51322f99ac5b48cdf4f62f3ea4787d4554325619f992f63267b623290a2d916715c56369c8cd4e821f3f82aca595972195f1b0c907642d SHA512 e99ce3c9d7115c01246d8de95c74094a940a2b442917cfa354399f700f2f828005287bd6906675cd7495b5d654aeb9c859336444c4d9c141c91dac2fe2c32d55
-MISC metadata.xml 300 BLAKE2B 080ba19508bb68fa6b5ae7e6bc53066f7a7efe2dda7e8e3cd45eb4e67e8b58086da8991f16298a97b6c6659616bb521ed8be5232c41fc712413ef97d16d311d1 SHA512 6968c0889e20fc4e26fc8626d9dcc25a97e6c755b323c181291bafcb5186e519f48e52664e01b4e14cc49561af1fff365f90bcada9c876ae65487ce81639fc76
diff --git a/dev-python/python-urljr/files/python-urljr-1.0.1-gentoo-test_fetchers.patch b/dev-python/python-urljr/files/python-urljr-1.0.1-gentoo-test_fetchers.patch
deleted file mode 100644
index 5a451e4a5600..000000000000
--- a/dev-python/python-urljr/files/python-urljr-1.0.1-gentoo-test_fetchers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- urljr/test/test_fetchers.py.orig	2007-05-31 09:16:31.000000000 -0700
-+++ urljr/test/test_fetchers.py	2007-05-31 09:17:47.000000000 -0700
-@@ -8,6 +8,8 @@
- # XXX: make these separate test cases
- 
- def failUnlessResponseExpected(expected, actual):
-+    expected.final_url = expected.final_url.replace("localhost", "127.0.0.1")
-+    actual.final_url = actual.final_url.replace("localhost", "127.0.0.1")
-     assert expected.final_url == actual.final_url
-     assert expected.status == actual.status
-     assert expected.body == actual.body
diff --git a/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild b/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild
deleted file mode 100644
index 2451a5c0f226..000000000000
--- a/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="JanRain's URL Utilities"
-HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/"
-SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="curl? ( >=dev-python/pycurl-7.15.1[${PYTHON_USEDEP}] )"
-DEPEND=""
-
-REQUIRED_USE="test? ( curl )"
-# test fails if it finds 'localhost' instead of '127.0.0.1'
-PATCHES=( "${FILESDIR}/${P}-gentoo-test_fetchers.patch" )
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" admin/runtests || die "tests failed"
-}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 58703a2d5855..9345db7e3856 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,3 +1,3 @@
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
-EBUILD qrcode-6.1.ebuild 684 BLAKE2B df5ae31fb32dad39f0ade5be0daebad87befe1b552b63a1864f376ae3dcf5d80cdaeb3afe2911bd9d13c71d4aeb7097d4bf7839f6d7181848ca60d9eada5bccc SHA512 48cb0f1a081062a256c9226e4c8c3801efc9374a53827355b651708593ceb71961c56278f215c539d117b2d81bc2156fee220df14d4d8e17b67694e323dc0156
+EBUILD qrcode-6.1.ebuild 683 BLAKE2B c7fa225f146cc986a4b42b739c2f3d64e388053f7c2064ebd09884d87a1524c46638e6e85ad420c03b0d737a8c9694f5ef577c7efa67d5484a907b740f9459a1 SHA512 284d2fc741ebf519b2ddda414eafbb9de0bf91af738a2bd18a4364b7d09ead8820417dcd242141f3127d842a9587b6e28b1fcc81babb341af6bcafe5743d990a
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
index ece12a005c11..61e2a9c17c3a 100644
--- a/dev-python/qrcode/qrcode-6.1.ebuild
+++ b/dev-python/qrcode/qrcode-6.1.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
 
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 6b5d96e04921..ecab29801727 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,5 @@
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
+DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 EBUILD qscintilla-python-2.11.4.ebuild 1782 BLAKE2B 2484322cc56bd746192300cc954f2c5af3041b2b48db25f1c0f952357bb0b037c398727c5161a7ab9aea63586207fb1989c87b599160c0e2e088341ba8356da2 SHA512 26836958cb815c272ffeeaabb858f296f586af6d49f98202dcb975fc83706f964b43cd40f607d1586c0294bea9af35032a562c4c982d72d53cd974518ab32a20
+EBUILD qscintilla-python-2.11.5.ebuild 1788 BLAKE2B 1b82c0af7b35ad9f7d4e343ae772a87c4a6784ef51de5d9155f9d8381976be63025b551dcd1769ed0da349d6adecd341b053cbeb4d1fd5553dce345592ea6b99 SHA512 e5a95258bec3adfbee11ff0b2e97c63a8948e471912edf19869722c4628bf4b2c62340616268f26ac6612d6cffbad7327bff72b427139e79fc0446235d88feef
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
new file mode 100644
index 000000000000..45a5ed0c4c68
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
@@ -0,0 +1,78 @@
+# 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 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+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
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
+			${MY_PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${MY_PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 831b4177536a..0d2011ddf149 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,5 +1,5 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8-r1.ebuild 1031 BLAKE2B 515b36ef61938e7b35a296a5bc8d12e9646ce2b51ccd26b6a2b9c76385d5d43fec00e7892dff5c736192a9789a057642d4efb98010880629894e2d5f0b38ff93 SHA512 0b7ef5def4bc0305eeb44fd6b95647d2b3cd80377cbca68a0ce5aa2480611fd7759a43f7df54237939557a0ac9a635415cec1856cab44cd8c8442ed45998cf74
+EBUILD raet-0.6.8-r1.ebuild 1030 BLAKE2B 1d584778f931d88cb13cf84f5d25f1391774d07dceb5fa0351f0aba05941380338d814f4b212e019d23e0d21d6d457a3e8dbe16ac8b3a3ae5dba32cebdbde425 SHA512 e9689a56d13a6230a90c25d943c601061923ed80eedc5ca5bb9f9bf4e2a25f728dfea0647c7ad7c024ae7e9dffff08799885e8ebf0d479c566a46fc451cf9fac
 EBUILD raet-0.6.8.ebuild 908 BLAKE2B 3fc45741dc163e06dd450730feff0007ec21f88ae7dbb3c0dc653b93bcceea29b1d3aa7c34a572f0b28971dd7b8738693a22ae6b13610e978497c355b0ff2b6d SHA512 025be2d4a5b55ec054b60669c6ae02380b51fe3467670081502713fa36c81722720b760e49f7545137b826c969ab3b4a69919d307ea82a9817f23bbfdfbd7536
 MISC metadata.xml 489 BLAKE2B f5c03c42cb002c7d6c81692f7f98312ad51a06e306a33b63cd048cbb25d0ef1429e5322bc5eb08de2d3d5a179a100f61c5e73d7f874a43e009eb0bcad8013e26 SHA512 0987a39737bc4556adf615ced4c1550f69fd952d32f5208b91763da8d23021fa88c5bfebe0f12fa382fad2a4066f68fe372c637389543a936dfc818f1de5f621
diff --git a/dev-python/raet/raet-0.6.8-r1.ebuild b/dev-python/raet/raet-0.6.8-r1.ebuild
index 217a7b9449a8..4ceac99cd6ad 100644
--- a/dev-python/raet/raet-0.6.8-r1.ebuild
+++ b/dev-python/raet/raet-0.6.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${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/ramlfications/Manifest b/dev-python/ramlfications/Manifest
deleted file mode 100644
index 355bed9d682f..000000000000
--- a/dev-python/ramlfications/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ramlfications-0.1.9_p20160718.tar.gz 1104645 BLAKE2B a33cb4529db10b92280c9ed6bc04e2d4c2d534cc4748ce219984f7fc4c7bc432ad51adc901ea021b64a3776402b159d38cbd34e2c2bca4b863f012026e2b3a0e SHA512 a21330cddb2d390744d7c13ee62edd701f74a83c16f87b897460e2353e265f4171e90e8b51bb0c17762a1f3494ddf8aeaa22c36f0aa093f936b9a51e2d75d1f5
-EBUILD ramlfications-0.1.9_p20160718.ebuild 1192 BLAKE2B 8a3c00eb9eded08e4d11e2d27a4bdf449f007431a056a6bfe53fb663719c6382df0d2ee5656ca3a2d0315c9f1ce239f06b3217df583a1b01839938730d28b616 SHA512 b4517801f088e2206dd51b3ef72947eadf9f63135ecde40df750e6bcfab6cfd5000e3a30932d63f1d98d95713009d139813aab8f43ceb2029362701f514ce829
-MISC metadata.xml 617 BLAKE2B e7d756795e3bd5ecbf40036f15f12e06a35475e0ff82973bb99fb4a95879d5f7e21d3a91db0d3e33c835f05c73758ce7de7351d7d56cc856e7d4d54a68a6d246 SHA512 e9d8c043de1fd9743bec663f2bd3c9ede4bc430f5c28630f6446eae128bf8be4854d61f45447436277860cf22ff67f52529beba3768292102351f464b910e035
diff --git a/dev-python/ramlfications/metadata.xml b/dev-python/ramlfications/metadata.xml
deleted file mode 100644
index 287698f5dd9d..000000000000
--- a/dev-python/ramlfications/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>spam@lynnroot.com</email>
-			<name>Lynn Root</name>
-		</maintainer>
-		<remote-id type="pypi">ramlfications</remote-id>
-		<remote-id type="github">spotify/ramlfications</remote-id>
-	</upstream>
-	<longdescription>ramlfications is an Apache-2.0 licensed reference implementation
-of a RAML parser in Python intended to be used for parsing API definitions
-(e.g. for static documentation-generation).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
deleted file mode 100644
index 56171eb5b114..000000000000
--- a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6)
-
-COMMIT="32a11cd7d75c4c5b3e3fc01c383314be298b0f9b"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="RAML reference implementation in Python"
-HOMEPAGE="https://ramlfications.readthedocs.org/ https://pypi.org/project/ramlfications/"
-SRC_URI="https://github.com/spotify/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markdown2[${PYTHON_USEDEP}]
-	dev-python/jsonref[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 3362ff722365..8e25086630d8 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,4 +1,6 @@
 AUX rdflib-4.2.2-python3.7-StopIteration.patch 2064 BLAKE2B f9a646703c9f3a0e0767739d171c0649c855354484699f46d4f5a3d9a73979b54d2953ccff3a9d5f85ce1a26f5af2cab87fc24fb25af10a952eccba0d076a0db SHA512 99d28c46f8b857074d111ba09db3f5afe1f7ef1e5970d7c539e9c0f309ab6781ab432a3315a3a2cfe473e0eb38a4df9e81b8185bde1541de74dcc0a739871364
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
-EBUILD rdflib-4.2.2-r1.ebuild 2920 BLAKE2B cff4677952fae3d1e7e0535e5678c6700ba3c98b5e8f586880c16de853f392cf2e75037dcbbb2107636ba4b9cffa04c4cb83ebb7615cafd910fc89a0a4c59c57 SHA512 d8a57097c36f2d6a37e5c6a4885cdb3f74955cf6822af87528f2a52ea4ee0ae5fc65f397c8fc32a288071adb4be14cb8d66d8a97b7291d12da11e2fe2ab73be8
+DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
+EBUILD rdflib-4.2.2-r1.ebuild 2646 BLAKE2B 200438df7ee74d82c83727e877f5226970a56c20b8d4da2907089f9d7dd127e90c185497a87fab1faef8b4b563b9df5e403083890879a9566e91977f3c57b2a7 SHA512 67386d00225887ebc55275080672de3bb83830c1848dc6aa6f5e05bc774750e17683beeb45604aabf3aa32a30186b255467b9915605813ccf8ae0be52574d37c
+EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B e95dc1f09551b279076d5b2fce01df9772ec29b30a96786d04959f43cbbcd90c360409a15077f95629b49cd00cb1c6dc438ac6e7f958d4e497caeddd5124d980 SHA512 f85beda0c258d8cdbbdc672f5755436b2be2e3d50d289d1b66846cdba5bb6dbe2765e8eebbdc034b30603726a400606dc95feb1980dceb17b4ea5d837a62b6fd
 MISC metadata.xml 487 BLAKE2B 6ea6370e51bf11be515d0f860bd4ebdd0ed57b3975a3e2bbd0912a91da824378b84d67cafd3bef185178aa88eb29aa6c389d99c87b5cca469b7b04ac91b2d10c SHA512 3e2ac7fdca434ecc3dc2e53323af84f0f272b402bff973a04c78c04c02dd3fcb9bc4ebfe586c0d2e72e565ce3bc948a2bfd0c876acfd76b11c5dba3bb34a3ab0
diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
index 6306fc0eacc7..a6eb50c7d38a 100644
--- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests
@@ -19,7 +19,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"
-IUSE="doc berkdb examples mysql redland sqlite test"
+IUSE="doc berkdb examples redland sqlite test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -27,11 +27,6 @@ RDEPEND="
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-	mysql? (
-		$(python_gen_cond_dep '
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-		' -2)
-	)
 	redland? ( dev-libs/redland-bindings[python,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
@@ -83,14 +78,9 @@ python_compile_all() {
 }
 
 python_test() {
-	# the default; nose with: --where=./ does not work for python3
-	if python_is_python3; then
-		pushd "${BUILD_DIR}/src/" >/dev/null || die
-		"${EPYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-		popd >/dev/null || die
-	else
-		"${EPYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-	fi
+	pushd "${BUILD_DIR}/src/" >/dev/null || die
+	"${EPYTHON}" ./run_tests.py -v || die "Tests failed under ${EPYTHON}"
+	popd >/dev/null || die
 }
 
 python_install_all() {
diff --git a/dev-python/rdflib/rdflib-5.0.0.ebuild b/dev-python/rdflib/rdflib-5.0.0.ebuild
new file mode 100644
index 000000000000..ee3a9c338a1e
--- /dev/null
+++ b/dev-python/rdflib/rdflib-5.0.0.ebuild
@@ -0,0 +1,48 @@
+# 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="sqlite?,threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
+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"
+IUSE="berkdb examples sqlite"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# these tests require internet access
+	sed -i -e '/doctest/d' setup.cfg || die
+	rm test/test_sparql_service.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+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/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 9e9f6900ebb5..009cb7889360 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,5 +1,7 @@
 DIST readthedocs-sphinx-ext-1.0.3.tar.gz 11589 BLAKE2B 9c6ac1bd3baa2a92cbc67d18f5fd6b3f63ce0fe7cc16832ad23940c7b8d85d88f299c8cba6623d0c2b229cbcc43e43ece926aefa01d6a3055ef9c252ddf68dfd SHA512 571336adbb3f6c9077d2530562f5d72092f8df440b282187fca5aaeb2a9c281aa49bc29423e550905696a200f692ebcea5fe6f83e023f64759224697c49e2f03
 DIST readthedocs-sphinx-ext-1.0.4.tar.gz 11686 BLAKE2B 3c188e52682f8c24633f79b9ec0eed7f06c922989f7578f06e0ede0e3844ca019e1905450df8d12150d05f3a82a1103a0786cb2c60dc3551e3e3097849cdc301 SHA512 52f45c26ae934b44a41073a9e77096ea8ed97f2a36ed1ea9b63084be0af58dcff24c6b729cda7a8b631f9fe5f56822ceabdbbd2e11056b44df18212986cb445a
+DIST readthedocs-sphinx-ext-2.0.0.tar.gz 10570 BLAKE2B cd1d424ede0958dd3d14b0b3f207e8080b038de294d003244f81d7eecaf5d8ec9a54c22d77460096b6bb3b70cab0b3915f94f0c529e9754a39351f7a4201dab5 SHA512 7cbed8a1ea0ed9f61d9fdac7ed283c7f49d78d8661ba7165efb763a4afd34a47c557174e855f73637e5a9aeaaff0c5acef1f1d273363432886343dcab71c29aa
 EBUILD readthedocs-sphinx-ext-1.0.3.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
 EBUILD readthedocs-sphinx-ext-1.0.4.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
+EBUILD readthedocs-sphinx-ext-2.0.0.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.0.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.0.0.ebuild
new file mode 100644
index 000000000000..e8bb844066b9
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+PDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${PDEPEND} )"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 32f9e61b7019..ecb3d9df705e 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,8 +1,6 @@
 AUX reportlab-3.5.13-disable-network-tests.patch 886 BLAKE2B fec5e11e9219e0ca320263539ca50016fa94829029b36922bf213544b827e736c6e060cd6946bc1584cf1b2b0a1a026b7df41c68d1081acba50956686663777b SHA512 561fd5f5a3cca662317fad3ae8262880b825765537fd2746042c92f290a0ced95ace7cd8d02316250f02843b4a27e0cf916bba6fb2efd4166cb19f3da6c7d6f2
 AUX reportlab-3.5.13-pillow-VERSION.patch 915 BLAKE2B 91f1177441882f055f0d9b1fb3c5eceb2acc0130e81e98ea0fc9ca1e9de332d438ecb223771e2c91a4b6d12d368f7974cdb3e1389a36be735c7fbeb9679214f9 SHA512 04d2c6a5f93f0fd00e903cc64ed71a03cdc898b3dbd94e8065712acff3b9f55c8e04fa78832ee90d91dbad129767a0357b59646f7284ff545236f5a4978b4ae3
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-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 1341 BLAKE2B d87fa7cb343d0b5d306045bc1e69f10566eb0f142b599131350eec98cd984ea91c2db5d20b386723771c206bc2aec88d06acec1fe6d15409d9790f73499ae625 SHA512 cab97db2c7a559bc516d7d9be0340280103294f3d2448939dbe64b3457214329b379aed40637e5f18cd0c07367400bac7d746b74e0e2472d131853493d94ea36
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
deleted file mode 100644
index 23688607e2a9..000000000000
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} ) # Tests crash with pypy
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="http://www.reportlab.com/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-	media-libs/libart_lgpl
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.5.13-disable-network-tests.patch"
-	"${FILESDIR}/${PN}-3.5.13-pillow-VERSION.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd tests > /dev/null || die
-	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	if use examples ; then
-		docinto examples
-		dosod -r demos/. tools/pythonpoint/demos
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index 526450b78748..2e431d10f632 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 721 BLAKE2B 80d1c483f5f5970b96c71d218bbea46bd30491495a1aae70071fb86e5eb015bee2d0ac3d367a2baa48c340f696f88a13c2a44ea468adb877c09f136f96abeb20 SHA512 381b2de86127277f1b53d4c50908e2e2bc9adccece4f4a530f30847d2ae2448a97cd1bd7512b242b2b5b4ecba7947e9a624f98f04ede105d628ec117500d3e5f
+EBUILD repoze-lru-0.7-r1.ebuild 720 BLAKE2B b7597c8406e66d94113d03b4b15e4dd432dcd755809fb854bab7344516dda5eb655837fc7bf166b21abb7def6cb4bdb48e75b570043aff9b14827d3887203057 SHA512 9a9eb5a314c0f357baa550718dd5e477d5a62667bfd0bc994a480249654b98a34f5780ce98ed5561bd0accf01df95e1818b497cd6954b8743bee296e9430980b
 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 1f6d58936640..084a3b600770 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-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 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-python/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
new file mode 100644
index 000000000000..6ee06db54831
--- /dev/null
+++ b/dev-python/requests-unixsocket/Manifest
@@ -0,0 +1,3 @@
+DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
+EBUILD requests-unixsocket-0.2.0.ebuild 693 BLAKE2B 556528d8ba9bbc283a6a7b03f805409d9bcfd1ceffa9f46520a4351c4923efde17a7332e6e53fe2e04b324e827f8cb6add0738031ec7774870f7490c4963df8b SHA512 f62ada55b01f1da2a1808388973958fbb33ad86bb24c54e470d899aa8d0c352b8904b2419744d64e4095fb2061f744fa6baf29e00a328adf2a958906604d7dd6
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/jaxml/metadata.xml b/dev-python/requests-unixsocket/metadata.xml
index 3a3a70253635..266e3f19ca59 100644
--- a/dev-python/jaxml/metadata.xml
+++ b/dev-python/requests-unixsocket/metadata.xml
@@ -3,9 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="pypi">jaxml</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
new file mode 100644
index 000000000000..2934c5039ed0
--- /dev/null
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="Use requests to talk HTTP via a UNIX domain socket"
+HOMEPAGE="https://github.com/msabramo/requests-unixsocket"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? ( dev-python/waitress[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--pep8::' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 33701045f7f4..7771bc3d0ecf 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,7 @@
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
+DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
 EBUILD requests-2.21.0-r1.ebuild 1423 BLAKE2B 99f0a4cfe05110aae07cc2f37614331a31a0434d2210329c01bc3625e692c2b87e2ebaabfb1f614ebfa5bf1a561c2a0de84699d4c05baa877e59b03bcb9d80e7 SHA512 c086ec4cbc080d4e650dff189482d84cffbf3ad3a0cc7bcaa2cf95c09a8b78f70839dd414ce35fa7b5b35cc22e69927844cc07ca9d58384944f49c1ad950039f
 EBUILD requests-2.23.0.ebuild 1732 BLAKE2B 01f605e552fe11e164a98fca79f0f3c57bb33bce116f1ce3459b2834521c63519bf35c517e074116e8ea3c308ee85861fd2c7eb8263ec0f884223bb3f66b4563 SHA512 abba3e4e19049ec50def900418a0acbcbf0604e5f125a3d96e1a80696bd98570df6a88a384b6992b987e9bf3456ed08720acae0e2aedc052962f090f4b516c29
+EBUILD requests-2.24.0.ebuild 1495 BLAKE2B ca34e3efee6d0ff88b612a16ae0646c43d7e7f3fac352527c8434a90437308d56d172a4173157c3c04875c91d5a054fdac964141e100d40c634d051065b21993 SHA512 3fb9ca3018b4e812b52d3c579d76560d17fa9982b1d67702eb8a324d87d0e5215cbd93c9338af43970c76e92d91d9e63f0af2875216b31fc570dee0c74e0cbfc
 MISC metadata.xml 744 BLAKE2B 19542f217a9eef39ef564113f3ca4e4c6d443f15cbddbeaf3f6f388a883bc5c4c580f3f3a9d61c72e2f3176cad8550045b3c22a845c8ffe0a5489fbcd579e9a2 SHA512 4f2d9ed98b518691b0153f35b7e46cb065e2b89a738a337c5204b3da484df4a148cd8f770dfa631ee002db9468512f165ca9c5e0bd505a367adbb59d4a6b3ec9
diff --git a/dev-python/requests/requests-2.24.0.ebuild b/dev-python/requests/requests-2.24.0.ebuild
new file mode 100644
index 000000000000..51621d6caab8
--- /dev/null
+++ b/dev-python/requests/requests-2.24.0.ebuild
@@ -0,0 +1,56 @@
+# 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
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="socks5 +ssl"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	<dev-python/chardet-4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-3[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip tests that require some kind of network
+	sed -e 's:test_connect_timeout:_&:' \
+		-e 's:test_total_timeout_connect:_&:' \
+		-i tests/test_requests.py || die
+	# probably pyopenssl version dependent
+	sed -e 's:test_https_warnings:_&:' \
+		-i tests/test_requests.py || die
+	# doctests rely on networking
+	sed -e 's:--doctest-modules::' \
+		-i pytest.ini || die
+}
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
deleted file mode 100644
index 2b8eb5331c8e..000000000000
--- a/dev-python/restkit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX setup.patch 843 BLAKE2B 80626eb7317e42fc828493d98afb330873040bd0bf3a33c4c4ef225a4f57bea078e3440172509a5442868c565eeaf675c82c47d514bb4a915881d8aec2456a4b SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387
-DIST restkit-4.2.2.tar.gz 1275904 BLAKE2B 4ebfc3ad91265954c28712e4beadcb25a467fe7af8c68bb655016ddb20877ca63275136605400c59b462825526a59f69d69d4b687641816b4704b62623498734 SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b
-EBUILD restkit-4.2.2.ebuild 1371 BLAKE2B f2c028f74cf47558335741dddac8614f85f7bf46af4444cd4e2282c9190fc7f73ceb450ca5b70e3981f03de7cc8489fd6f1f6f78d78ed736257e0388941095cd SHA512 bfd6d15c46c1bd8b8098fbd5b0d5eeedc9be6e7d62d102348f8e1c6dc3247e81db3be41a0189424a7b1cb887f551bc391fb2f4d178159becdae7502e40338056
-MISC metadata.xml 432 BLAKE2B 577df51a2d5444177626d99df31020b61748deacf6586cc770fb36275f8d61bffc1b63c0267967873b5763d6260139ce236947614c716c2c5588c0dd1882ff54 SHA512 a7fe76d6995cabd2a49aa07e9479bebe385d7de317d9b8c5dce6cb82ad8381178a280b32a90c8447a78bb7e4294ee771cc02708f30bfa264a43a46d014f0684d
diff --git a/dev-python/restkit/files/setup.patch b/dev-python/restkit/files/setup.patch
deleted file mode 100644
index cfa8959539e1..000000000000
--- a/dev-python/restkit/files/setup.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur restkit-4.2.2.org/setup.py restkit-4.2.2/setup.py
---- setup.py	2013-08-30 23:07:36.000000000 +0800
-+++ setup.py	2015-01-16 21:38:04.342084550 +0800
-@@ -38,11 +38,6 @@
-     with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
-         long_description = f.read()
- 
--    DATA_FILES = [
--        ('restkit', ["LICENSE", "MANIFEST.in", "NOTICE", "README.rst",
--                        "THANKS", "TODO.txt"])
--        ]
--
-     options=dict(
-             name = 'restkit',
-             version = version.__version__,
-@@ -54,7 +49,6 @@
-             url = 'http://benoitc.github.com/restkit',
-             classifiers = CLASSIFIERS,
-             packages = find_packages(exclude=['tests']),
--            data_files = DATA_FILES,
-             scripts = SCRIPTS,
-             zip_safe =  False,
-             entry_points =  {
diff --git a/dev-python/restkit/metadata.xml b/dev-python/restkit/metadata.xml
deleted file mode 100644
index 10ec59022ed9..000000000000
--- a/dev-python/restkit/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-needed -->
-  <use>
-    <flag name="cli">Install the restcli command line interface/tool, based on <pkg>dev-python/ipython</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">restkit</remote-id>
-    <remote-id type="github">benoitc/restkit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
deleted file mode 100644
index bb7283b0aaa9..000000000000
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ /dev/null
@@ -1,55 +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 HTTP ressource kit for Python"
-HOMEPAGE="https://github.com/benoitc/restkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 s390 x86"
-IUSE="+cli doc examples test"
-RESTRICT="!test? ( test )"
-
-PY27_USEDEP="$(python_gen_usedep python2_7)"
-RDEPEND="cli? ( dev-python/ipython[${PY27_USEDEP}] )
-	dev-python/webob[${PYTHON_USEDEP}]
-	>=dev-python/socketpool-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/http-parser-0.8.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/epydoc[${PY27_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-# prevent duplicate install of data files
-PATCHES=( "${FILESDIR}"/setup.patch )
-
-python_compile_all() {
-	if use doc ; then
-		pushd doc > /dev/null
-		emake html
-		popd > /dev/null
-	fi
-}
-
-python_test() {
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use cli || rm "${D}"/usr/bin/restcli* || die
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	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/routes/Manifest b/dev-python/routes/Manifest
index ef01aa343956..33dc304a63c4 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 1435 BLAKE2B 84d71b3cb5f3596afcceb607028fb04c1aa64d291807ce0005cfeaea812ea4001745c8b03947ccb555a08c4b6f4a705f49ef22a0af555e17d85c844afa2e29fa SHA512 4f87ee90d60dccaf63102cf962891536361c964371e4a2e8542d38ac32d61e39443aa9ae6f03034dae1a308fc2015acef240476f1f1e57ea504437f8e4c6b0ce
+EBUILD routes-2.4.1-r1.ebuild 1434 BLAKE2B f58b564def8cb7784370ddffc7b8540555a54c750d1308075125217f1493f4f69b7ec6012415169c09c0c83e8d466350dc6b1cba0a82666ef7b6b70418199cc5 SHA512 495b458fcae689818513c6e6780e345aa50cf51f82901022c752ab183851f598c421638732665b5d9d5af6e57a56967a62a51d6907bfea3c88be15c1c7fa6555
 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 28b69fd9dca5..06e5798198e0 100644
--- a/dev-python/routes/routes-2.4.1-r1.ebuild
+++ b/dev-python/routes/routes-2.4.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
 
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index be3ea6d59d8c..f35bffe46d21 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -5,5 +5,5 @@ DIST rsa-4.0.tar.gz 37385 BLAKE2B 2621ee732f15ea12283b723efb5e88847d3e030e8115bb
 EBUILD rsa-3.4.2-r1.ebuild 726 BLAKE2B 1148a8eac8fff822edad880881c00287cb6b524f8de887803c2dd9e74170474d84c26294115d2ae5eb59ba6ba1c4a78eef00ed320ab4a0afe102344f1db1eeab SHA512 1cdb51bc1b094f54e9af7a2e598ac7d2a2865fd81352d6b614aa1a7864eafd52a2e7b5bdb747d6bb4d6d6e67ac27097eb61548563583db1e6eb6c7b1ac432fae
 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
+EBUILD rsa-4.2.ebuild 753 BLAKE2B 7f5ab2828d5af07a4bc278639a1dad1d45ffa5b8cc024285b1450a83c2a31c524e0e2f1700a5d82cd6e038989dd16b414db80cc8c145b42260da09ba5e363d9a SHA512 b79955f7dfb28e429153259cce481defd5e3e2e68b64733a45d99f40adaabd27469b20a94e63f822d372b430d0db8793a987706201725e89d44d27ab12a297f0
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-4.2.ebuild b/dev-python/rsa/rsa-4.2.ebuild
index 482d5791c157..cbdb124567de 100644
--- a/dev-python/rsa/rsa-4.2.ebuild
+++ b/dev-python/rsa/rsa-4.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index b76825d59b4f..64cfd431d1c3 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 684 BLAKE2B 475c5789650524b79e08d83dc48283664d048199fa1689519a1309cabd4c3728a720c65c691be441cc8b31097e760c2519c959a7134aed642403f34b924664ef SHA512 1d0e0c4401a086f7f69380334ddd92bc639fefdf2832087b42acd1db3f2db108b884eb53abfac9e9eaac899c92de363e544c3e8d06ef5caff5f145f4e09b0f8c
+EBUILD ruamel-yaml-clib-0.2.0.ebuild 689 BLAKE2B e8a4ab74967fffab25bb1e00d11740e7662f0b1f71ec3c8e1c87b2c6a047ae6583bf851f68aeca0f0237e99305e2e8856922db91db94403fbbf1a1ab0ade7b94 SHA512 4b7beb3666959bb068d4111686cee9dbb26f96cdeea529cd93fe2cb1017c70cedc382329d64b341aa661b65b9a8ecb2017a0fae68ce13c2814fdd495d6f9f33a
 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 22323438628e..b1a52c4c5edf 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 ~arm 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 acde0b95709d..86845b406490 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 734 BLAKE2B d0dec59ca2d23cefc374db11a6bdde42be73881e6df7ec29fec76ec9df8e38d7de4cc9d6c40822ed9b131443434c62ad1c3ab0435858824e9b4697dc69ce46f1 SHA512 9eab5692a9e5b2559ce2ae4a96941bc02c09b334b785b69bf7fd774b4454e5d33ac4cca479552478a4369a7177aa5ed1eb4c3ee3c8551f9801affeb0a35cff7d
+EBUILD ruamel-yaml-0.16.10.ebuild 739 BLAKE2B 80670bb74b5c76c521e93e85e8d7d3195de3669d81a5b655091e39124f7a129c12ce774c456b8f4877aaa75374cdc05646b406101f767f857c7f0b57ce082410 SHA512 8f515f395cb80679ab4b84f1adfbdda6381a78125346aaba66b6bea5a8a1e5cf73be2e11fd89405a4703fbcb3588b8fde82aa5ab1868738b3b7e13f7c8ea6ff8
 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 d16113c156a8..48f24d33b5e5 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 ~arm arm64 x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index 92dc8feddb7c..1064791cfa46 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,3 +1,5 @@
 DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
+DIST s3fs-0.4.2.tar.gz 57527 BLAKE2B 74836547c270e00daeed55321a4d685a638a30a27ab65ea34ceaf55e0c44f1fac66a0802e602c052a5abc8e4a7bca778df7167751a6cf7a177f6a382012741de SHA512 7571a2d3ad998aab7dceb334bfcdb27035f21bfca04fd0828e75c1d860c2662f0a1c8c49317dabdbf2d7c21371c5dd6983a5aea760d2f71bff5ab0dfa9c9a14a
 EBUILD s3fs-0.1.5.ebuild 659 BLAKE2B 87e2fd184266b4ea2c9bc310603e7b8deffeb8e044cd8cd59308885f761e8592e565054788d57d0e8e753687dddcd032ff42e7ec6b25cf2d1dfc22897af078e6 SHA512 c1c253ee6931e1040d9a80672a0d70ea7ae01cee7cc5ae93b40fa58ac0f10f6d73091590d48959596c4c2841fc40dd3003e98e117583e2d306d2fb6349b0de97
+EBUILD s3fs-0.4.2.ebuild 794 BLAKE2B 4b10316b4c6dd3f7dbd6ea04c2309b5cb0959e623614ae7f5e4cc577eebb1d7ba9f4dddf5c445aba43cd4513637e03e0112393148dae710b2c843a6c040a6a52 SHA512 9867912bdb5b14c2658a8bca5de75c3eaac5849e7e031b63e8325a0e2f544f4de8332f353a90f6817e42181f24dd5f78b9838a25aecfba5775ea59fdbeafc69c
 MISC metadata.xml 383 BLAKE2B dd7df24dbc399b716f8611c1e669109e394371d6dfaa1c5e126c46c18e92d6533a5f8fc6d67e332e4e6e0a5db5e9324b2771fc9111a71a9942ff00b8bc69086e SHA512 e3a9960695a141ba0abe3be9fd8827fe6ac76363c48accdfecd551d876db6089d3c3b595f2a6e0351ab1ea68c59b3e73667a3d757fa0a5b989cbba259e113680
diff --git a/dev-python/s3fs/s3fs-0.4.2.ebuild b/dev-python/s3fs/s3fs-0.4.2.ebuild
new file mode 100644
index 000000000000..55ab54b3b1e9
--- /dev/null
+++ b/dev-python/s3fs/s3fs-0.4.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic file interface to S3"
+HOMEPAGE="https://s3fs.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/fsspec[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires internet access
+	sed -e 's:test_anonymous_access:_&:' \
+		-i s3fs/tests/test_s3fs.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/selectors34/Manifest b/dev-python/selectors34/Manifest
deleted file mode 100644
index 48f56ae00c80..000000000000
--- a/dev-python/selectors34/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST selectors34-1.2.tar.gz 10145 BLAKE2B 6cf47acd1175de7b46dbf06d4358973740b84115bcb62bca695358ab761476f4ec527f4fe3afeae3c3129e4a68c7034b50ee4b317e7d85cc43e0125de81f5d16 SHA512 66fd545d5163ee3cf7e160e428a36f70d43c5a6a8a5adcd6a3028fe67ca818911bc3de934d862d06806dcf051516856baf34b99d9e2a062c214eca667fdff65d
-EBUILD selectors34-1.2.ebuild 485 BLAKE2B d14bcb6d3a9e276163c64e595f692d76ada3e68f31c1829a4b1e58efd61a57e87a4618cfb757be728795e420a1150a8ab1820d798c65b375195e22a11b00782b SHA512 77b3d104dcf793c4f8e43367c9d8634601ff453dff4d65686e44e810203ca79608c1ae0b9a7adb56e773f8a086719f5aacbc85acb9419f7aed560e3e93003d0b
-MISC metadata.xml 378 BLAKE2B bdc18fbcccd0582723bd2806e6f749aad2735cf55d6a82b88d2141b92de24c0c63a0bd55e2b49613fe91406c4fe7d35c1e7cc7e23ca0064ba0edb797b59e4fc5 SHA512 3aa7b7ec03e37413a17323a3db7633f05044d958b1547c3dd420588ee3056c8b938d30f23b69fb7584cffa9c59d7ee69689be9c5d0d4f248fc9b3a093191d297
diff --git a/dev-python/selectors34/metadata.xml b/dev-python/selectors34/metadata.xml
deleted file mode 100644
index b97e795afe06..000000000000
--- a/dev-python/selectors34/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">selectors34</remote-id>
-		<remote-id type="github">berkerpeksag/selectors34</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/selectors34/selectors34-1.2.ebuild b/dev-python/selectors34/selectors34-1.2.ebuild
deleted file mode 100644
index 71907274c1dc..000000000000
--- a/dev-python/selectors34/selectors34-1.2.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of the selectors module from Python 3.4"
-HOMEPAGE="https://github.com/berkerpeksag/selectors34"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index b52395f0d03d..0652da7e0017 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1155 BLAKE2B 722ce960d178b877ef6c2ae8bf8f6594db1d346b3852b12265dd4579be208e9725a9e0f02de5dac1be47bfc6a9d4ef7041f7a0a11413baced91a0145f489bd17 SHA512 75fcb3fd8b98bbe0cf16cd71227e4b2af4cbbe403aef7d2a691e874ff37b1ca3cae89453ecec69f8478e7c547e91b03405c5fdb5877cb43cfe33abf8612f815a
+EBUILD selenium-3.141.0-r1.ebuild 1154 BLAKE2B e5f120b6d780e19a1dc4efc4d959e60752adb6347ee0bd7ab27784dbcda920b4b29c7b5fc146ff251bccb4140639a40d39b2ea6a7d62cc83e61eeae061d77040 SHA512 a561dbf3b23a3bf3a91a1b7902fad5375ccb41dbc134f28d64e2d89cee0d778e3c47ce73e5fc27bc3beb6e6e2951a442bd54ea9eb81ff233e13c43d854004d36
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index ffe849757169..9fe259faec8e 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.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/semver/Manifest b/dev-python/semver/Manifest
index 3ffe49c7844e..966f7fad7b66 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,6 +1,3 @@
-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.10.1.ebuild 700 BLAKE2B 3f7a78674c297932f98a41e3e321f5674e2d08d786880d2b27a3332ff804a4035b38d475a90a2af50baf7f7e8200ff1199839c3aa488b0a1d287097adee88199 SHA512 ec89b7d7dce97e75c467c83b83c9bc00d8b205e08934bebbd7a12f37373bf42bbcd61dc92c11de36b4f3e7701b16b70dda9416c885d899e5299ba044a28d19d3
-EBUILD semver-2.9.1.ebuild 634 BLAKE2B df3071945288e833b5e0ca14226e7aa4cbe580673bb55ca2079387908345eb5304619dcc764ff8c34224fc5bef841029d660ab8b79a2cea31ce1867005f77bdf SHA512 c6cd63f6db0b23006379af516b2de00edb440edd13d6b5b90024f7bee2386e1ccd3d720d0be03ab6f90c6cf97eecdccb70de4ab71c74969d399aad994ca1eab4
+DIST semver-2.10.2.tar.gz 40449 BLAKE2B 47601c60591218a1c3ec8212520ddaed2ae9a9c6eca6cd1e9509f0ca713d4149de1c3d786a553f277f4b0be3af30c6484b8e9669cae98a6de250f74d354849b5 SHA512 64f115351d896fbab5145fe4b1438f69c713c8e864701e90a5c81f25154fd6828df14856499f17adf008b25becc474ad87e2c10db3937efbcb64bb62a58d6c75
+EBUILD semver-2.10.2.ebuild 653 BLAKE2B a49a3688a5e66d4ec8f7bb26f870f89615e2b78ce2510e729a06aa2fb3b57d52286a956573db1df947481b44351b10ef39f4f71a340c0d01a95982144701d37a SHA512 7c1722855079484ae82734fbde9c907327521c54d8ad6a01a4b6a2d65745665ecb4d6b91b2c5aa5539551206ec756659aa3d9e7c883104bd2abb3f441a88ccdb
 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
deleted file mode 100644
index 1a86ad0449d1..000000000000
--- a/dev-python/semver/files/2.10.1-getitem.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-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.2.ebuild
index 880b90a3488e..7e7deea14b72 100644
--- a/dev-python/semver/semver-2.10.1.ebuild
+++ b/dev-python/semver/semver-2.10.2.ebuild
@@ -19,8 +19,6 @@ IUSE="test"
 
 S="${WORKDIR}/python-${P}"
 
-PATCHES=( "${FILESDIR}/${PV}-getitem.patch" )
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/semver/semver-2.9.1.ebuild b/dev-python/semver/semver-2.9.1.ebuild
deleted file mode 100644
index 623eb636fb98..000000000000
--- a/dev-python/semver/semver-2.9.1.ebuild
+++ /dev/null
@@ -1,28 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~ppc64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/python-${P}"
-
-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/setuptools/Manifest b/dev-python/setuptools/Manifest
index e5893046b0a7..9568a27b122d 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,8 +3,10 @@ DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d28
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-47.1.1.zip 870277 BLAKE2B 0ba55f2b51011d4f98a554a959227dba83a79e7369a3cd54450a1d18cb378bf7cfaffc1aa25b0ee11760e917d6f74891f0a63e43478893ca4327e0f5135267dc SHA512 053ffd4c26bf0cf1894754b1ed922be03c6fa2cb54a41e3d28a7d8f7a2fdf2ccebbca4e0bafa16eed476923ef70cf4294ed36df6e77603b2fae0a09b684132c4
+DIST setuptools-47.3.1.zip 869963 BLAKE2B cecc4d43ce09708c2454c20064baf8b5597aff29bf069a859ec7d6a91588456455df611f962cb90650b23ba269bbedcb81dff568b4498431cfa20f46ece828dd SHA512 05d8ac5e1612f0c22d9f51b5dbb22cdd1edfd9c15e97c5f31f6dee8d660e6ca19720cee5169158d0179baa87518766fda1cd2e4d5c69f683e973a9ff08155d48
 EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
 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
+EBUILD setuptools-47.3.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/setuptools-47.3.1.ebuild b/dev-python/setuptools/setuptools-47.3.1.ebuild
new file mode 100644
index 000000000000..69172f4815f9
--- /dev/null
+++ b/dev-python/setuptools/setuptools-47.3.1.ebuild
@@ -0,0 +1,67 @@
+# 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,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 8e6e7e9234fa..5b66dd1aeb51 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
+EBUILD sexpdata-0.0.3-r1.ebuild 534 BLAKE2B 55df86a3a6c5df7fc01f160f4a56db36b294169b0fe43f3206936e4aedba820edf2e28fda43ee36deb20b196a9bc0b8f3ace1cde335149e9292b8d9d52245c25 SHA512 b106c0388c99413c5dcd3bb271f7280855aa99d18c600b8c1d839671f5ec07260b27db22f2e19ac6944019676c06d48ec2fe6dd3bf02c2984ac741cd9e20594c
 MISC metadata.xml 329 BLAKE2B fbb2f8210e6dd71fac93c2b9c2a99f21a59141fd805276c3de543f969b7bacbf65c4bd239136bdc280fb5eb298aee160193c28a65e2cadacabadd90c8dde7b9d SHA512 98e7efd62fd98efa6fe6fc373d438b8f5132b68787f2b958319d3c7b07b589adb94136762ff950a49adb27d21a780b8cfca54afb1ff30a7c486381d9a7b87e6d
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
index 99c85b495e51..d04ff2733427 100644
--- a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
+++ b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tkf/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 4d70b7f24a68..43e4f1700c1a 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,3 +1,5 @@
 DIST SPARQLWrapper-1.8.4.tar.gz 56757 BLAKE2B 1d181a4269d4d2eadfd860e014f31f9134b500d4df437ab548804166821c574cfaedbe011c6b24328a40296da88378205b45839d225ada2b4afc6ffe28360f2a SHA512 301fce7f58b369009a13988a11d782fce6362d73472811a07dc4d962062097b48470c573f5bd1dc337532db467e75936f9e89fcc64dde91930077ce4a1657179
-EBUILD sparql-wrapper-1.8.4.ebuild 613 BLAKE2B c0727f83fb5981e82b257e0d3a7a95d00ec90a478f2ec8c2bfc81d53247964bae65756bb60b291b45a660309d4afd6574bd2c17a93d80b5c8b30f50b1691e971 SHA512 adac21dff6631efc9744f4b1fe6716149839db1eaba021424d53871985bc202863676b447e0136b5e467bd34d8088159ca755252d56dd9754702a8efa33f6201
+DIST SPARQLWrapper-1.8.5.tar.gz 89117 BLAKE2B e36f90b0bc8adc789750e7db588ada22e369d10e1ae94777b627680070f4ac8da3e7575c7858121386287034061b6fcfbfbb529f9d8de020ae65a7c6bdb2ef80 SHA512 b0cbe9f7f13a8a0a1c88a17b5966b46e7811acada2712ee03be97808dcb17ba4a71990c07df5d213d21815d7deaf3526381a2cc864d839e561e242be797b6bb2
+EBUILD sparql-wrapper-1.8.4.ebuild 607 BLAKE2B 3ab5fb334faad4b73436911d66111517893bb966d3a723d1499e922eeca30c6acfe43df6598a0d65dcc0cfc29f76dc0dd1c0f44210499c8700a1ada4871a9d1e SHA512 5ea1cb3097b9633988da26b43b54b7f38038544024d92744a8740f68f60cc2530d0c9ccd830c7854a102615b35a36b6dc9c4f43a30371268ff2adc8d3c381879
+EBUILD sparql-wrapper-1.8.5.ebuild 1381 BLAKE2B 430c7257df00ca47163a0d91b82c98e8fe10b5c261d83634cddd5f62a9afba6e9795686661f1954de6517a940c87b03e150b4ab89858e4663a99812c323b075c SHA512 b8b7fa48bba5011a1e7519010bc7965b54ed8df4c5b73b90c0b22aaaccdeeb59399cc1f30aaa619be4d5e09cc29b13970adfd6079f990d0113c12b27135656c0
 MISC metadata.xml 351 BLAKE2B c701bb1843f62813bf8aebc5dabe1f4ed1f9ee610acc20cf9ab7ddd9bdebafb056063748579ac644a9a518f9f3fb51eb552ab5f6e4abc88434e1fa3f4be13d5e SHA512 5bd96f30563b46e9005b8e295038bd2ca340f6c2b0eb75f9f238a508d43d1bb066017b583cd8ccc243261d14314aa044cac9f27ac8cf1cacfc0e785b00aeb33a
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
index a2d1825d5d80..cf3d616cd242 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild
new file mode 100644
index 000000000000..f976ffbb90be
--- /dev/null
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.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
+
+MY_PN=SPARQLWrapper
+DESCRIPTION="Wrapper around a SPARQL service"
+HOMEPAGE="https://pypi.org/project/SPARQLWrapper/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+# the vast majority of tests access random Internet sites
+RESTRICT="test"
+
+RDEPEND=">=dev-python/rdflib-4[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# disable sys.path hack
+	sed -i -e '/^# prefer local/,/^# end of hack/d' test/*.py || die
+
+	# urllib2
+	rm test/wrapper_test.py || die
+	# connection timeout
+	rm test/fuseki2__v3_6_0__agrovoc__test.py || die
+	# HTTP 401
+	rm test/graphdbEnterprise__v8_9_0__rs__test.py || die
+	# returns some HTML page
+	rm test/stardog__lindas__test.py || die
+
+	# require rdflib-jsonld, apparently
+	sed -i -e 's:test.*JSONLD:_&:' \
+		test/*.py || die
+	# some plugin error, probably the same
+	sed -e 's:testConstruct.*JSON:_&:' \
+		-e 's:testDescribe.*JSON:_&:' \
+		-i test/fuseki2__v3_8_0__stw__test.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	cd test || die
+	2to3 -n -w --no-diffs *.py || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/sphinx-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
index 2a9929a13620..05c423713149 100644
--- a/dev-python/sphinx-epytext/Manifest
+++ b/dev-python/sphinx-epytext/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
-EBUILD sphinx-epytext-0.0.4.ebuild 570 BLAKE2B 01baafe5284b87d43027ed8f7962bbb73e46191d8b7d65739dafd121d092355345bf5802459a3c5b5d60aee44ba4293f863b6df39fb76c27c8232a4385445fc1 SHA512 ae1429e9f5b60b1d378cfb249f2c5b2bb8d37ff5f17e10fbe7b7bf3b1caeb535f26e1744e56894abab2a5f1120f1c1283e1088e71c964e9a63cc55aa93eed32d
+EBUILD sphinx-epytext-0.0.4.ebuild 572 BLAKE2B 0e11ce5bcd6e8871a2f68acf61ab0a6061303526a3a52a0c85768d7edf033e1eea070c7a17e0a97a2c39fd929dd53b3713a14f831f90feb4a672dfe417b70701 SHA512 908afbe85da6a60f46c7df6eaab7202777c394696e021ebacb6ec844c09bcc6e6cdbdcc4bfe528bc1151205d5a4e38c439555e98d65d0ac7b16666238432a6a3
 MISC metadata.xml 356 BLAKE2B 4ce928f87d2f4d479a2e942bd4b3c9b9a57d3ec2560335680345447406352d6ca27e56a3b5ef93329b7a07baa560747d86bcdb1fecee4f2a8a0ec61aba5c5490 SHA512 138f3bf854d2d4883dd4f5f2d1beed68c7822d30db5a79b899addb874555104cb875c980020f9bf924127fc10ac512c00ca5f9b62b04031790dea66174146038
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index c74235473097..b5e3dfbcf619 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.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} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 6df9be4a88a8..b06dd4ac6d4f 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -4,10 +4,12 @@ DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da
 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
+DIST Sphinx-3.1.1.tar.gz 5932445 BLAKE2B d98d4e1d546a60217779a071d642cef8c4b703715e212344d904fc343928afe4b21722d953afb67add0c0390633f3c2159b2235d0a5dd0148946ebfbf473c215 SHA512 0c97cab085b1d8152cefde73a7e2116e83426a1ff071c8be9b37ae8e8cf82e9abefacad2cb37a86e1754fbdf57a8dc05ee3041d7dde506fa103babb82c380293
 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 3956 BLAKE2B 7aeab5ed471682f09b43ee43c87c7b8e2db526a1a54a8fc77d3923f4a5938ad6638150c49c3da0baeaf40ca3974d5ab770d5c1672fd43e4797ae50f41f164c99 SHA512 dd508c5a3993f8d6a4ec9b88f834340bc7f385040fc814417e7af50d2ac676328a694a35c233f1c3868a255b4140a62dee981a0181d3995be87140c9b81c4f86
+EBUILD sphinx-3.0.4.ebuild 3955 BLAKE2B a800fa8c0dc2d6e9f6499a688888f397fe4e6d929ec7cb3e5e7ba427c549438b9a7f363be926c214496523a41ecc58bae20d58ab7a852b5496bc66381f2b56cb SHA512 bdf19e8fc0b2ba18ab36724c887b4f2600f00162cccdd8b94733c9077e7915bdd91e387856f533c4e9e31c69bde9becd1df91e0810692ab433ceb32af5655436
 EBUILD sphinx-3.1.0.ebuild 4775 BLAKE2B 29587fdcea2941967b086fcaef708e74c599c216a45df08cd33fa3fc87912f8b129806c1bfe07db450d2d99864fa78ce9d315a063b1a5db8f61db19bb7f49339 SHA512 f77036ecaad0798063ae2853394a639d53d7b238978cf878ebf0daa1764b8342964a96f1332e9bd0816b2369376ee9b1d1bd282936d17235631250455583d13c
+EBUILD sphinx-3.1.1.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 44f026f88657..1f6b617345ab 100644
--- a/dev-python/sphinx/sphinx-3.0.4.ebuild
+++ b/dev-python/sphinx/sphinx-3.0.4.ebuild
@@ -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 )"
 
diff --git a/dev-python/sphinx/sphinx-3.1.1.ebuild b/dev-python/sphinx/sphinx-3.1.1.ebuild
new file mode 100644
index 000000000000..02e54fb7e8fd
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.1.1.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-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 311745b5799e..8afd37bb2cd7 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 1042 BLAKE2B c56674de86f2e25efd4ae6e46414eee774b2da97cc03a3212b844f43359c861e773aea93199b8ed21aeac122a25a6b0053318f79cc4821015d33c584048ebe4c SHA512 9b9320ef9e43c31c2bf63c244752568bd945f89747150e1a8b4ebcbf5e670687e85052bb207af5e3f85c412f0b81f5d1204c90733490a45a2e6b772a8a539e6f
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1040 BLAKE2B acb4d1a2decea53e0b1925ea1dfce618d8eb487f96e8a47ff8ed9ccdf21ca4639511e517386125b870e8e4f9e73893eaeba1fb133d54bcde44df09f8ab8c1d31 SHA512 510f537ef4779cbfd969b171442d9bbbdd2ecd5c71269c80d1a703202ce31c9e5b912f81ce06b5a271c8cade8b6d7cc5492d925fa5c15214b1987870da7d2a2b
 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 9b2eff38c130..c7a68fe3a95c 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="~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="doc"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index ab28d6b12d30..e5aac9429f24 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,5 +1,7 @@
 DIST sphinxcontrib-programoutput-0.11.tar.gz 18267 BLAKE2B 790483b09a00199e4f6a4bb723827001e3dc252b294244ddb5ed3edc78cd8dde41fd0c5cab6d4fb715c85f8c447bf25d690b4f921341769de6d7d1c9dc7f4a71 SHA512 4aa655f8632093035de986fa31291f95e95c4c0f4d1458bb8c8cc077cca73d579b16a8bf103d7b34faafb2171c617c40200008d89186f8ed37a812459f0376cf
 DIST sphinxcontrib-programoutput-0.15.tar.gz 21772 BLAKE2B e3bf609315e0298e73bf37db0d7e4d5175121fd0b0c612083427d60ab10cbfc1bf65c572b9ce561b05c9adffe288df7f0b28d6f2daa44af197d22b99ec8d00f4 SHA512 08444118daf09e05c1318ee87a22fcccb7822b99d58d18cf46748aa32338f35519017839c233cd5176a5426cb5f55047039ee28a26f6f4ebd99a35b199c0ff19
+DIST sphinxcontrib-programoutput-0.16.tar.gz 23714 BLAKE2B 1e5136faa89a2f303008fb0e24f99f544464d30f5c0c072db4e2e25cb30bfc3cd4af6157f6c8dc7ddfaffd8f6587435c5947b6981c34daf2d6029736fdc22870 SHA512 6003b8ce43ed468b01f6bda02c6f58c0518b38c43a75f1ed0869dd8df2ee215310246b7feeba90f213547644c1bdb0164cf1f44f44879ac054dcbd6d6f48a69e
 EBUILD sphinxcontrib-programoutput-0.11.ebuild 989 BLAKE2B efaaf074b62993e4d4290b46b52ede381d6355386bffdf8294274e45eaa8b7a6d018f8d9b2ba14eff336aa93add0a92e7157dca9646a927f6fcfca24b19622ea SHA512 c92c72416cb952b61b00fa365335ad2e5342fa9dc6bc85e18b05e5957a128ba1cffda62a440940cb6a62807e9ae6a74ab6b4bd457cfd6ca3cadda4d8991fec8e
 EBUILD sphinxcontrib-programoutput-0.15.ebuild 859 BLAKE2B 86b1d256daa1a1589b07d4e4ad70f9264b5c6362773cfbc9e62e039f77772b38724f40b8252730204eeed6a77814694bf0f99916b1e96087902bc3ecba47fb3b SHA512 c8f350ffee8fbfdb47b300a946ae6daf4b966cad589545c07617733c371441ff23944be42266d76b5c8e8b8137b99e827f78860444059f50de44856228b89fc7
-MISC metadata.xml 778 BLAKE2B e1b70f68bd7f2f941e6f95092c1a30e1cd1ee4f6d8f6e7a20af4523526996e486538a13dfdae57ae9d7d52bf60a11c1579eaa32ace1036473132df2fd0be1deb SHA512 be98a12eaa6514973c2da8ca9cb2c9b6ec024048b8cbff82e99d126d0aa25ff784930ecfdc17d4cc7eb4cfc45d3f39a4c07e48685c9dd34fe381cc4f5a33c4cd
+EBUILD sphinxcontrib-programoutput-0.16.ebuild 817 BLAKE2B 797b7eb6d7e9d3eb08cd7f978dc7cbb5d4e7862e287bc90e7c84a25a36935d211a9c8bff093a6c61b29996d55435f58f2278f370af0d148f0b543563a11985be SHA512 80585e30dcd25507a5064269013cfa6b8591cfbbb4a71a9607ad58db4855eed3a092761c94e6a6b848656b21f1abc04df6fe0fbf02eaaaa871753cedab62f019
+MISC metadata.xml 1301 BLAKE2B a06888ae7ead57744b4fae443fd5bd9cc56c0edbcd6fc970da654f0a0a637753ba4bd91f3a4d8d947d821e0ef81db0a4e007cb5428fe80a8390712dd4259b521 SHA512 1ba0ff36a8a2e57fa17b34e7cb6435fdc90ff1cdd2cb655caefaf9343a4e87009d6eaa25de35124bfaeb93a255c815c99c277ddcd1159b99edf6bd2ee57a5f40
diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
index d8d6e44fd9d3..201946fd5ca8 100644
--- a/dev-python/sphinxcontrib-programoutput/metadata.xml
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -13,12 +13,26 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <longdescription>
+  <longdescription lang="en">
   A Sphinx extension to literally insert the output of arbitrary
   commands into documents, helping you to keep your command examples
   up to date.
   </longdescription>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-programoutput</remote-id>
+    <remote-id type="github">NextThought/sphinxcontrib-programoutput</remote-id>
+    <bugs-to>
+      https://github.com/NextThought/sphinxcontrib-programoutput/issues
+    </bugs-to>
+    <changelog>
+      https://raw.githubusercontent.com/NextThought/sphinxcontrib-programoutput/master/CHANGES.rst
+    </changelog>
+    <doc lang="en">
+      https://sphinxcontrib-programoutput.readthedocs.org
+    </doc>
+    <maintainer>
+      <name>Jason Madden</name>
+      <email>jason@nextthought.com</email>
+    </maintainer>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.ebuild
new file mode 100644
index 000000000000..61213711be9a
--- /dev/null
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.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,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to sphinx to include program output"
+HOMEPAGE="
+	https://github.com/NextThought/sphinxcontrib-programoutput
+	https://pypi.org/project/sphinxcontrib-programoutput
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index c805059799d6..f6c80a577d4e 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,5 +1,5 @@
 DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
 DIST sqlparse-0.3.1.tar.gz 67572 BLAKE2B 27c9267de1a269a4574019d457a3dad53ad805e56a57ba73e294c229a7852b7ca04557fb45d07566e94eba7593257ad7eb413b1e0ec04d1044838d5039dc8ba8 SHA512 4c56a528b43578a7a48fc31cee369215b15761d9903ea1d8e034c69f0eb6431dd15362aab13af25a36fccb361436f1cba746bcbb515cbab5d30319629dd2ddfb
 EBUILD sqlparse-0.3.0.ebuild 968 BLAKE2B 91e2d7dde49f9c32ba6a5269e68441b2df5563a37931dd48a0d8f22c9ce5981c86bc44084afc8595009ec0569ef0b48069edade3e98d10ee02db3da36d409849 SHA512 c4d340255b8bbc4d34f7283dee99ca3965a50f5bd8e9a724c29caf35214f661e4c1cc9f22ad10ed40c845ea6744405dd8ca33e56d8cb7a3f685809a697926a7e
-EBUILD sqlparse-0.3.1.ebuild 647 BLAKE2B f7ee01c33290ec7580e8e61ef2fa68774b06de47de2732bda478121efdeff9f9781b0b2641b8d37dea75d288aeebd0286441820ea65c3cbd20a400d731a17946 SHA512 174fcb19b753410407da1f71fa13531062765dfed36a6611703b0ed150f3b349c082dca2e8d28a8cc39808d2fdf59ea7a4953eab6412d1b623348a29792ba9ce
+EBUILD sqlparse-0.3.1.ebuild 635 BLAKE2B 963f921e76fc971a005eaac7105ab75489bc1749cace130b06fff3241d6b023ad04da7bfc636551acefaa622c291ac2ad8ad9873aa49e32d6f0e402973747f3a SHA512 200c5bf66e86f4f6812191df4d4cd2b10ba7857f8985ea4470a6410998843522d9ad2064655b209f7307c15463775bc86edad8eff6e4f20eaf696db88bb21667
 MISC metadata.xml 384 BLAKE2B b35ba3bdebba668141b296a8e2c0d54b68015d6a6fbb0daa682e115ae0544da0fd588b3197dbc26e798214e5caf09dd01a46cbad9ced306a1052912826c41f08 SHA512 b54567937860fe8b488bdc27710f66692efe134520e32070734fcee1fcdb25e96a09117f43a5edc9f70bc6d7213814344fecb98b5576cf46ea85a3b5fd90b51f
diff --git a/dev-python/sqlparse/sqlparse-0.3.1.ebuild b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
index 8b5e082e4988..edaec538f391 100644
--- a/dev-python/sqlparse/sqlparse-0.3.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.3.1.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
 
 MY_PN="${PN##python-}"
@@ -17,7 +17,6 @@ S="${WORKDIR}"/${P#python-}
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
-IUSE="doc"
 
 distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 569bbb84fc24..c567b65fe28e 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -2,6 +2,6 @@ AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e
 DIST statsmodels-0.10.2.tar.gz 14065612 BLAKE2B 0df1268de5e4108b3cc541df87a5b9d2321bd3062d4daf1cc1aa62ab08ee777bace2f10bdfb51f088a66f15287c62cf851b3f43efa7eb1227e71c06632e80d55 SHA512 bd1c0784b0b17a3ca69fef5848f5eea8dcf76b1943599a5e5c285e45b7fcc7e44c0e388f007913d420ff6f3cb66a653d1c43e6e8addef534ff5572fa69ffb54a
 DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
 EBUILD statsmodels-0.10.2.ebuild 1853 BLAKE2B 3ee1ea4e063f910e9c33864d9bb71287410e754d1b805f5fc82f13415985e41eff0e885b11dc8343b229a4e15cb3841b9de56ce98038200b457a9770e0bdbcf9 SHA512 3486f76fb0197f505f1c3cd140d89664b3aa5a4bd3965c54d77a91dc8dc8083f789aa6687b0e8daa0370af9b87eb0e087558319f43791e5abfa9048a7f5e8369
-EBUILD statsmodels-0.11.1.ebuild 2020 BLAKE2B 84767231ba2f550ba13e7c37fa1d86da86a43a3e529a120e10eae3de287da8bbff879a22f7637f15a31264ebfae516c52d3b9d565b4ae306a96ec518d5c89141 SHA512 a145d93ea7ae2991e7d979591b55bf320d2a8ad5e0438bd942a729f1bace2c4bec11c7f80cd9e1d53f547ae22bc5bc3e9e03db3a3ec0829a23240761207a6622
+EBUILD statsmodels-0.11.1.ebuild 2190 BLAKE2B c2b301e26cf1415c954406958348694670a762696a84d3810c9897a8181b4e65d6a22560f196aad664713751861deb24cd39fa432b301a7c25d57ad36bbe6011 SHA512 d4b9e564747af0b109d1ed2057f5646d323172898c4eb532ac07f18a45cef0174a4c99317c15142da081a0af0dfdf7c1b1cdfb19452e91c611ac54918bfee127
 EBUILD statsmodels-9999.ebuild 1984 BLAKE2B 7ee4c8dbe27a102107ac29f0438b8608492cadde4bb6740cfc7c70781885ef256164a994f592bbd6a00b75767f3c756f1297e16d8ff4fbb6e752a54f26c0e95a SHA512 8e3bcafaa6251aec5e3bfc40afefc00608a5c13eb80ebe5a9eccbcd2dfb8072f10f88679710cd757c70aaee88865d6abc830b7fd1a0faae1caa0b8b7d80748f1
 MISC metadata.xml 1310 BLAKE2B de8c73b0fb91a3bd65b2ee149b3ef01b3f93c78dfaf1642f9c81335e21c0ace42a771a0901a30dfebc7a8bbb80e9fb7057bd047a26035e103c7ece9e9dbef58a SHA512 96bfb2a3e0b677a67c0256bfcdc76b3621eac9d9242c2aaa7d22322bb53be9bb2185ed82a2fa65cb7cd16df7562c1999ac0d936471608700030ecff4de7174b6
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
index c8bd303f2fe3..1e97a2638b10 100644
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 eutils
 
@@ -59,12 +59,19 @@ python_prepare_all() {
 	export VARTEXFONTS="${T}"/fonts
 	export MPLCONFIGDIR="${T}"
 	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	# these tests require internet
+	sed -i -e 's:test_results_on_the:_&:' \
+		statsmodels/stats/tests/test_dist_dependant_measures.py || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	pushd "${BUILD_DIR}" >/dev/null || die
-	"${EPYTHON}" -c 'import statsmodels; statsmodels.test()' \
+	"${EPYTHON}" -c '
+import statsmodels
+statsmodels.test(extra_args=["-vv"], exit=True)' \
 		|| die "tests fail with ${EPYTHON}"
 	popd >/dev/null || die
 }
diff --git a/dev-python/stomper/Manifest b/dev-python/stomper/Manifest
deleted file mode 100644
index 2c72d99d4abb..000000000000
--- a/dev-python/stomper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stomper-0.3.0.tar.gz 21051 BLAKE2B 79505d042933fe1127f151f209139c48d268d73ee443a21acabe5768b4ab627b60100dabd7116b62501fcdd5795acbc6bc400bbbdae370f46d8bde94dc0db3bc SHA512 ba6feef44bb33a9b63f789043b131a314b903fda847dbb3ad909614a2a6b2b39f2d98dcd5bf19b070f4de9cec9dbce9cd79eb135911f16c1e8dc6d5f52158516
-EBUILD stomper-0.3.0.ebuild 795 BLAKE2B d332f51bdce8d803fa4e9fc42d1c3d4fecbed663b3b5f6b65f7b68024159df06a02ee19522f0b856f052aceefde6e936cbe99e10a471cb93fcaaa7ab94ad3392 SHA512 319183019c17dab58e84ae9ca43fc76e158eda4341de6e13f2d240480991e91b1233f53dd7e4331fe4ade8c6b659a8654bd989395fedca200655d24bbbedb185
-MISC metadata.xml 310 BLAKE2B e1ecd94362bdf45d9e96eaf5405e8197f4fd8910493ab317dc74ac6ea3b33c88d397292dc6dc8cb96e5ca4cebf2aba58e8de179002a3e19a00042360958951df SHA512 9362afa04362bb46d638abdbba185063f8620836c458f18901bdb5fb6333b6a46ff873f9593cafe9e9149c35372fafe432121ecabc249400f11979bc6e66e5d2
diff --git a/dev-python/stomper/stomper-0.3.0.ebuild b/dev-python/stomper/stomper-0.3.0.ebuild
deleted file mode 100644
index 1da61eeff6ab..000000000000
--- a/dev-python/stomper/stomper-0.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# Supports only py2 pypy
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transport neutral client implementation of the STOMP protocol"
-HOMEPAGE="https://pypi.org/project/stomper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
-	mv lib/${PN}/examples . || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-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/subunit/Manifest b/dev-python/subunit/Manifest
index 63e4dcf50e16..b630308ac337 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,6 +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
+EBUILD subunit-1.2.0-r1.ebuild 2621 BLAKE2B 4e4f4caf6ea78a783a23ee20c251051bc78fcc933b099e4729c1ecd1a3d9b63a86519ec76d29eaba337c932ab969bd0493419ab2eb50436492e7894fc3ac6bd9 SHA512 f0d0a2053f0f09155605d1fdbb2fcdb089d4b6bf1881c61e8caef4d470bd6281f1ef8b11d2202e1b0ddf8cb90f7cd0657570c777694f707b7396d69a0d1da320
+EBUILD subunit-1.4.0.ebuild 2402 BLAKE2B 2b23d8e6cb91ea563724e49ee40270574e67efc183f8ecd446f4df67f789395c25e7622c98585848c153f161a2f10ab4053edd5f779dcb3a66d73a93e3dd41a2 SHA512 409bfcca1ef18bb4ee01291f3598e6d31b2e3df56bc5ac6aadfc00d734aa7f494e0ff5fee86531111abf868925aab90bddd0921ed0fe6b87730b1e7f19b12b0b
 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
index 9d375b492633..69fe77e2dca1 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	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}]
+	virtual/pkgconfig
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 73b540892dab..65fdd6aed637 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	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}]
+	>=virtual/pkgconfig-0-r1
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/symboltype/Manifest b/dev-python/symboltype/Manifest
deleted file mode 100644
index a69e3a226c03..000000000000
--- a/dev-python/symboltype/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST symboltype-1.0.zip 9507 BLAKE2B 35032a90dd1b73dcc1226e445427ff8567693046fe03d25d0c24befb2d5aa2def7b2e9f3ef955486544547d16cd04a41a188e12cab9f3fac797c39436eeda90d SHA512 1484adf4bd2df4f6def5cb6dab50e17d21a2baacb12af8a03aa981478deb97d1cfd3620c0e7d0e6e8c631b0c6bfc3912196c20a0feb39a3ddd4cf9e9dc42b6b2
-EBUILD symboltype-1.0.ebuild 715 BLAKE2B 97c8ac70c15b0fc15b83b17cdf59a8030d4818da70294fb42374cc7b30583578927a29833236864d21505d862ca6b1788840a740f1e46ebf326596623dc7e5d5 SHA512 6af93c7d038c273131e1fac8e2978157b069a360c7c3bfec0708addb15e959c511cee95417894c61207a2c6817176d33727cfab3eefc25886e88ef8bb6d70543
-MISC metadata.xml 323 BLAKE2B 4bc599f34ef538bf30b1a1f20ad3773cd65c04e9341b86c876dba73eec725c49b7d47b252aa3cc18cafc51d29622625dd6e88eb5110f5fe502a067598f325d4b SHA512 8fa028634a6e9c5a60fdd9864555c2c9a626f1bfd3a5eef7e596ddfe0c66500c2839fd2aa8553615f85f02332d8b5255b2a920d531e4f939f46ed4a30f189b8f
diff --git a/dev-python/symboltype/metadata.xml b/dev-python/symboltype/metadata.xml
deleted file mode 100644
index 7e68881f8015..000000000000
--- a/dev-python/symboltype/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">SymbolType</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/symboltype/symboltype-1.0.ebuild b/dev-python/symboltype/symboltype-1.0.ebuild
deleted file mode 100644
index 2def120e04b8..000000000000
--- a/dev-python/symboltype/symboltype-1.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=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="SymbolType"
-
-DESCRIPTION="Gives access to the peak.util.symbols module"
-HOMEPAGE=" http://peak.telecommunity.com/DevCenter/SymbolType https://pypi.org/project/SymbolType/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 x86"
-IUSE="doc"
-LICENSE="ZPL"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_test() {
-	"${PYTHON}" test_symbols.py && einfo "Tests passed under ${EPYTHON}" \
-		|| die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index f1dd8295c1a5..9cb85a3a44b5 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,3 @@
 DIST tblib-1.6.0.tar.gz 31450 BLAKE2B a1efccab5c6363c166ef73e8e03750d1f47993684fda662065f9705d115347cf4b2ed3438ef375e3d14a0dbc35ceb234c8357ee33d2ac9e3a94b66bec3670b3a SHA512 3b11b94f341499f648c182e7a9b6c648b5312a18b3f23bf7e5d554052db4ffb7c4a4faa097bc2426b4159e28f0578c6b369ff4d02eb7711726b5359242216d35
-EBUILD tblib-1.6.0.ebuild 549 BLAKE2B 28b4717ff8f154f6020eb48389cbe31721fefb72191cbda2a1f0f4905f7cd1281331b70522e180959a0b7134c1c6ba87231b03c37be32a38a411f1c4d30492a7 SHA512 a9a9287f5c45a8de3dc79e6e2a17804ddddfadfb3d75ca3f1dd84b3c2a78a0c505d11a17ec45000482fb47fb7d47d40d76c2d68762a95b25ac8a887122ff3509
+EBUILD tblib-1.6.0.ebuild 548 BLAKE2B b5cc563baa22a6e78b60c55c6f64d8ec87173c97a439f1c49454385a79857e3221035b1fc2e15211c932b16fd546212e37ff58525650796714197d459dd9e775 SHA512 2f8c68a8ec6205586a7a9e0bfbc0bea2cd3f187a78219e2f6877596054e48c2fd766be266bb591cd697e872e0c8d2cedd2f0db60a991f2e82e11ae3ed57aca1c
 MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.6.0.ebuild b/dev-python/tblib/tblib-1.6.0.ebuild
index fd023572654b..df8114609725 100644
--- a/dev-python/tblib/tblib-1.6.0.ebuild
+++ b/dev-python/tblib/tblib-1.6.0.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/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
new file mode 100644
index 000000000000..112c520c3fbc
--- /dev/null
+++ b/dev-python/text-unidecode/Manifest
@@ -0,0 +1,3 @@
+DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
+EBUILD text-unidecode-1.3.ebuild 478 BLAKE2B 47533e1e4c0ee4737a0c843da3e887aad16cc22286e661e89aed0c25ba41d69f56a200748a1f7db769fe3718121af5c4e23f03183a8d4eb64e333a52817e9a88 SHA512 96030a13dddeafcb08b52021b0afe09beb7c215d0ba1ab48851b3b3d2a093bbc4fb3a4c80c1c31355bfc4a71198d37cebb34c83ce73e161476d4ee3a713a9d5a
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/stomper/metadata.xml b/dev-python/text-unidecode/metadata.xml
index 171eb326de15..266e3f19ca59 100644
--- a/dev-python/stomper/metadata.xml
+++ b/dev-python/text-unidecode/metadata.xml
@@ -3,9 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="pypi">stomper</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-python/text-unidecode/text-unidecode-1.3.ebuild b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
new file mode 100644
index 000000000000..3008ce518a91
--- /dev/null
+++ b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="Tthe most basic port of the Text::Unidecode Perl library"
+HOMEPAGE="
+	https://pypi.org/project/text-unidecode/
+	https://github.com/kmike/text-unidecode/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index 90c4aea170fe..27e4a715ed87 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 613 BLAKE2B b9f0b9c7d4822f8d05b558725f3a9bada8c93bca0aeb109960de0c28472deb6e13ac3083616b67717439713b73c2e7247d3b2253899e01967fa2e2cfa18166a1 SHA512 c6a59c29e709bf56ba4ae1cda0e496086215128e24982c719a42ae93555c80e6d6253c7bbe67888c10565577753e0f36b1ebc96cb39aa309cfaa8f203b4764cb
+EBUILD threadpoolctl-2.0.0.ebuild 612 BLAKE2B 48aa6a472fb702e8fd2bde90ed95b20b24ac6062b2b5877bfb708dc54113225e63da192ba9ef6b5a0479e64b5d8be411685730bf0a5306441502ec77f296ca17 SHA512 e365de736f942cc433518e04c79f55491792a7e440ae9ae3500c677a8da2f9bf6a3e0958515f24174e3f497d5810da3b12bfa4d62fa95e89d66c0ea1b8f36049
 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 7ef0aee87fce..40adb724f621 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index c82606547c69..4d285f03e13b 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,3 +1,5 @@
 DIST tld-0.12.1.tar.gz 1346595 BLAKE2B 393c052872218212ef13ee60d011ed5fc0ee8eea37530081b43004c3e4d9e64a6198df1191a4e28032a1ee8ab884d52297995e138f830d81a4bd8484e9aa72f2 SHA512 eeaab86528fdd516f8e8ff42bd04432d6c1bea995c673563630a2b849705ec08450e592c39f9f5e649ced93548443a766507474222cce31b86ef0fc400d766f2
+DIST tld-0.12.2.tar.gz 1347015 BLAKE2B d284581917a9ddee026d316961f2cdc6efc8a3c8dee8112c7266d55a9493f1aca831db0635db02b737bb3e02b3910a8822e121a5317ab02f5078075839e02c91 SHA512 b997bd3cdf22f65862c9b3e7d446014325d9538dd06eeed86f4b9b6c6ba440829b5d611cc19fed9bf8bf039ef01c4258c71b5c765bbecdfc345dd00e73c7fca1
 EBUILD tld-0.12.1.ebuild 492 BLAKE2B 9009d45cad616dbf0366bd6167110427247f21ec33c2bf761ff2c718c2ddc6162063ddea6b287270445cc7aeda8190933a8b1ef4a78f702052e549368850a69e SHA512 c101a9cce181a51628a533fa98dbd9307aee29ef6ed66e23dc37cd3b8d54dabf3820c62a850acdae67af03500348d2f3b452e28f17fccd7b4eb7bc14e6969c0b
+EBUILD tld-0.12.2.ebuild 492 BLAKE2B 9009d45cad616dbf0366bd6167110427247f21ec33c2bf761ff2c718c2ddc6162063ddea6b287270445cc7aeda8190933a8b1ef4a78f702052e549368850a69e SHA512 c101a9cce181a51628a533fa98dbd9307aee29ef6ed66e23dc37cd3b8d54dabf3820c62a850acdae67af03500348d2f3b452e28f17fccd7b4eb7bc14e6969c0b
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.12.2.ebuild b/dev-python/tld/tld-0.12.2.ebuild
new file mode 100644
index 000000000000..73e336742d2e
--- /dev/null
+++ b/dev-python/tld/tld-0.12.2.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=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="https://github.com/barseghyanartur/tld"
+SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 43d3799ae622..830a2cead0a8 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -12,7 +12,7 @@ EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc
 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 2280 BLAKE2B 9a813c89fdf90197b265e4c9f1f2aa2cf817122c4edb9b41606e35368dcb9b24f8e105d8fe04b5a90fbc6be2dca7fe05d8470983422da1cc780b668c0712a09c SHA512 806f69eb7a848de87fe9f45a7ec538c21f3f1d6a418d84f59b0181d1a6c6764a9ad1c5383e79e815aab04e93aff1473b8ceec5f31a496d3223795405e2daf364
+EBUILD tox-3.15.0.ebuild 2278 BLAKE2B 116d451fa83b57e7a0511cfc5648001316cefa089d763d28e0afbcc60a96feb1a6d415591571143dd9091a2c9a8056de16018782e1c8ec5d2301474d68b785fe SHA512 935cdd5ef0ec629bb9ce0b415aaba64420cddea749c841064e9004d9872a4c8869965079831d1da7f85e981b27a2b7a5c559a40d507e4eb07f1fb689da1377e6
 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
diff --git a/dev-python/tox/tox-3.15.0.ebuild b/dev-python/tox/tox-3.15.0.ebuild
index d07fe2ed8a50..fee50bc8c521 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/twisted/Manifest b/dev-python/twisted/Manifest
index ca250b7e016f..165f15fda5cb 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -11,5 +11,5 @@ DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5789 BLAKE2B 33995700df1fa184e1612aed28c2a42b413c8b5454c13a5e28ede8aa1398394b1e78159b8cea5210f18cccc10a03943a001e46d440240d2d588bd8a5c77cf097 SHA512 1c5428786d6aab20ef667578dd66d05bc22c820105fd700e1e0b15a2620985f10ad71dae14f88ccb9ddee1f155934cba4d3d01e9b87990ce521eedf3d751b45c
-EBUILD twisted-20.3.0.ebuild 5596 BLAKE2B 9dcb2d8428d9fb97f1d84bad8fdb3e78b349a003cb1a5a2c62832ebc03c8906fa586f9e4b1e95d02c871c90cafad2721e6939f003f71f598954ba6200a948ad4 SHA512 77383ed93cf4fa6051d257e7b7506f5efe399a274d112c9be6fb2f377e799261e034d14e0f750d0023e926e816e96db485c074557de0c06b760e938d08d3fda9
+EBUILD twisted-20.3.0.ebuild 5595 BLAKE2B 954a85bfcd63d4a861d3eede43a2e3f47f49d75aff3d3c11a78be5995d5db0b11e962a55d52e42b0bd0d819bb1b336cbeeaf095d406c3591e7ac6b21ccd8a2f4 SHA512 d0dc5e956273dc94d7b7f97d18dfbb14b7e42e9fdc9bc801720121f80ce3fb46de8acdab79690b1756e963ab598cec308aa1997539a81860ebe9d6689f76b369
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index a3fc5aa507b9..e15cad78074c 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 ~ia64 ~mips ~ppc 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/txtorcon/Manifest b/dev-python/txtorcon/Manifest
deleted file mode 100644
index 49921e5e193b..000000000000
--- a/dev-python/txtorcon/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch 6250 BLAKE2B 39ab5468825e1744b43efb394eff42b35e2dd95b4a10dd5879fc46ca63b1e228685505aeb9cdc17af60d82305152b9cb2924215611f2e2e2dcfb978032417981 SHA512 e588ae0bb319ad76e6563cce29524e06ac1a47ed634e62e010663a15e75e0e8e6b4001656dee7110aec0ff3ad75b02ec43fc108155c32108803310b34f2e45dd
-AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cbc5dc1e556c63375068bb3bdc94e5e17d3476f6bbe328fb094f4a48b1484da13b9d3ab8166d81a81d7e947b504c7aba674c3aa2aa1 SHA512 b0b563326eeb05171d58832e96bf7f8420c28b40a1b2916402b174238108f2bbfc95092543fef65af92600b822129ea6d8474d085a26f8db286d7a636405a0e6
-AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809917fefc21603a4de86119ab54dabad0e1258c8a387c632bd034decf1ea0d6a0a829246cacefd8651b84d1aaf10b55d2e5423d6ded58b92bfbd SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6
-AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8
-DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254
-DIST txtorcon-20.0.0.tar.gz 306139 BLAKE2B 54474ef6facf5c54ccc9feed0e8c5b58b3f5356b73290f7d0d488910637e541c2e4d7b8c90470aa561f6bcc202532e153761e9409375d102d9c68473cf34a456 SHA512 4856c86b3eac432b8e2dddec4d4ef3172452d084a5685f90335d366e918e2e80a223a7a31ff78ddb6dff1ddbbfc1e26f6d0ae9fb99bd47d6894cc6dd29365da8
-EBUILD txtorcon-0.19.3-r1.ebuild 1778 BLAKE2B fb05d3e43b0b5deefd796004485e658bd3ac755a847e618f4dbdde94c084c349ff2c37ae87f48e2f7463cc79dd36db026edfe75a974881c875fc26dca4f9dfd3 SHA512 081b9383013286c9c2b9cae3041bcc235b81c91ce8e9b1f250e03331a8d8341446dce66ccf3b9b34e90d073667d3c9d58e74a27949d3ad62509de335f2c7008f
-EBUILD txtorcon-20.0.0.ebuild 1906 BLAKE2B 642dabbf6f0bcce124e42b5ba7afd71e8b07615c207c07f039979eb8dd607e112d1d22b21008a8efa66dfa40eacc6f6fd97ce98243772076c7f785d6305726ed SHA512 1c4a841f0a53cf2875c42c7bf5ee523e37b2871eee6718417b8d106ca20a010adf2d3dd1dc122626e5a3ee6b17cef808fbc8a1aefc5839ee5d3a10e6b95e7dc4
-MISC metadata.xml 610 BLAKE2B fb46ec20d770d43ca8b92b0275068fabe8e71536cd792c9757517a128e1f602552ea518f9673a65750f246c5d16eac5e6ae508e2150522a746fc91016cd4aac9 SHA512 84f568e3bb39515ae42b119ba40aa7549e8bf8387ba3150675cd0625d14925de042a9b6057d7818611e45284175bc92bd2f73979d132b83adf4b7ebef0a9fef8
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch
deleted file mode 100644
index f142176dade2..000000000000
--- a/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From d9f0e2ea76cb54e3647fd16f3be0a8f0224505fd Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 19 Sep 2017 11:59:08 -0700
-Subject: [PATCH] test: Move tests under the txtorcon namespace
-
----
- MANIFEST.in                                        | 1 -
- {test => txtorcon/test}/__init__.py                | 0
- {test => txtorcon/test}/py3_torstate.py            | 0
- {test => txtorcon/test}/test_addrmap.py            | 0
- {test => txtorcon/test}/test_attacher.py           | 0
- {test => txtorcon/test}/test_circuit.py            | 0
- {test => txtorcon/test}/test_controller.py         | 0
- {test => txtorcon/test}/test_endpoints.py          | 0
- {test => txtorcon/test}/test_fsm.py                | 0
- {test => txtorcon/test}/test_log.py                | 0
- {test => txtorcon/test}/test_microdesc.py          | 0
- {test => txtorcon/test}/test_router.py             | 0
- {test => txtorcon/test}/test_socks.py              | 0
- {test => txtorcon/test}/test_stream.py             | 0
- {test => txtorcon/test}/test_torconfig.py          | 0
- {test => txtorcon/test}/test_torcontrolprotocol.py | 0
- {test => txtorcon/test}/test_torinfo.py            | 0
- {test => txtorcon/test}/test_torstate.py           | 0
- {test => txtorcon/test}/test_util.py               | 0
- {test => txtorcon/test}/test_util_imports.py       | 0
- {test => txtorcon/test}/test_web.py                | 0
- {test => txtorcon/test}/util.py                    | 0
- 22 files changed, 1 deletion(-)
- rename {test => txtorcon/test}/__init__.py (100%)
- rename {test => txtorcon/test}/py3_torstate.py (100%)
- rename {test => txtorcon/test}/test_addrmap.py (100%)
- rename {test => txtorcon/test}/test_attacher.py (100%)
- rename {test => txtorcon/test}/test_circuit.py (100%)
- rename {test => txtorcon/test}/test_controller.py (100%)
- rename {test => txtorcon/test}/test_endpoints.py (100%)
- rename {test => txtorcon/test}/test_fsm.py (100%)
- rename {test => txtorcon/test}/test_log.py (100%)
- rename {test => txtorcon/test}/test_microdesc.py (100%)
- rename {test => txtorcon/test}/test_router.py (100%)
- rename {test => txtorcon/test}/test_socks.py (100%)
- rename {test => txtorcon/test}/test_stream.py (100%)
- rename {test => txtorcon/test}/test_torconfig.py (100%)
- rename {test => txtorcon/test}/test_torcontrolprotocol.py (100%)
- rename {test => txtorcon/test}/test_torinfo.py (100%)
- rename {test => txtorcon/test}/test_torstate.py (100%)
- rename {test => txtorcon/test}/test_util.py (100%)
- rename {test => txtorcon/test}/test_util_imports.py (100%)
- rename {test => txtorcon/test}/test_web.py (100%)
- rename {test => txtorcon/test}/util.py (100%)
-
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 13dc4e2..7b8184a 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -22,4 +22,3 @@ include examples/*
- exclude examples/*~
- include requirements.txt
- include dev-requirements.txt
--include test/*.py
-diff --git a/test/__init__.py b/txtorcon/test/__init__.py
-similarity index 100%
-rename from test/__init__.py
-rename to txtorcon/test/__init__.py
-diff --git a/test/py3_torstate.py b/txtorcon/test/py3_torstate.py
-similarity index 100%
-rename from test/py3_torstate.py
-rename to txtorcon/test/py3_torstate.py
-diff --git a/test/test_addrmap.py b/txtorcon/test/test_addrmap.py
-similarity index 100%
-rename from test/test_addrmap.py
-rename to txtorcon/test/test_addrmap.py
-diff --git a/test/test_attacher.py b/txtorcon/test/test_attacher.py
-similarity index 100%
-rename from test/test_attacher.py
-rename to txtorcon/test/test_attacher.py
-diff --git a/test/test_circuit.py b/txtorcon/test/test_circuit.py
-similarity index 100%
-rename from test/test_circuit.py
-rename to txtorcon/test/test_circuit.py
-diff --git a/test/test_controller.py b/txtorcon/test/test_controller.py
-similarity index 100%
-rename from test/test_controller.py
-rename to txtorcon/test/test_controller.py
-diff --git a/test/test_endpoints.py b/txtorcon/test/test_endpoints.py
-similarity index 100%
-rename from test/test_endpoints.py
-rename to txtorcon/test/test_endpoints.py
-diff --git a/test/test_fsm.py b/txtorcon/test/test_fsm.py
-similarity index 100%
-rename from test/test_fsm.py
-rename to txtorcon/test/test_fsm.py
-diff --git a/test/test_log.py b/txtorcon/test/test_log.py
-similarity index 100%
-rename from test/test_log.py
-rename to txtorcon/test/test_log.py
-diff --git a/test/test_microdesc.py b/txtorcon/test/test_microdesc.py
-similarity index 100%
-rename from test/test_microdesc.py
-rename to txtorcon/test/test_microdesc.py
-diff --git a/test/test_router.py b/txtorcon/test/test_router.py
-similarity index 100%
-rename from test/test_router.py
-rename to txtorcon/test/test_router.py
-diff --git a/test/test_socks.py b/txtorcon/test/test_socks.py
-similarity index 100%
-rename from test/test_socks.py
-rename to txtorcon/test/test_socks.py
-diff --git a/test/test_stream.py b/txtorcon/test/test_stream.py
-similarity index 100%
-rename from test/test_stream.py
-rename to txtorcon/test/test_stream.py
-diff --git a/test/test_torconfig.py b/txtorcon/test/test_torconfig.py
-similarity index 100%
-rename from test/test_torconfig.py
-rename to txtorcon/test/test_torconfig.py
-diff --git a/test/test_torcontrolprotocol.py b/txtorcon/test/test_torcontrolprotocol.py
-similarity index 100%
-rename from test/test_torcontrolprotocol.py
-rename to txtorcon/test/test_torcontrolprotocol.py
-diff --git a/test/test_torinfo.py b/txtorcon/test/test_torinfo.py
-similarity index 100%
-rename from test/test_torinfo.py
-rename to txtorcon/test/test_torinfo.py
-diff --git a/test/test_torstate.py b/txtorcon/test/test_torstate.py
-similarity index 100%
-rename from test/test_torstate.py
-rename to txtorcon/test/test_torstate.py
-diff --git a/test/test_util.py b/txtorcon/test/test_util.py
-similarity index 100%
-rename from test/test_util.py
-rename to txtorcon/test/test_util.py
-diff --git a/test/test_util_imports.py b/txtorcon/test/test_util_imports.py
-similarity index 100%
-rename from test/test_util_imports.py
-rename to txtorcon/test/test_util_imports.py
-diff --git a/test/test_web.py b/txtorcon/test/test_web.py
-similarity index 100%
-rename from test/test_web.py
-rename to txtorcon/test/test_web.py
-diff --git a/test/util.py b/txtorcon/test/util.py
-similarity index 100%
-rename from test/util.py
-rename to txtorcon/test/util.py
--- 
-2.14.1
-
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch
deleted file mode 100644
index 0731132e4f80..000000000000
--- a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c2ddddde8570793f646c96038afc97fef4a809c0 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 19 Sep 2017 15:12:43 -0700
-Subject: [PATCH] setup.py: Remove remaining docs from data_files install
-
-These are better handled by distro package managers, don't belong on production installs.
-Please make these conditionally installed instead.  Preferrably optionally add a build_docs
-extension to install the built sphinx docs if that option was passed to setup.py.
----
- setup.py | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3020112..a9f3993 100644
---- a/setup.py
-+++ b/setup.py
-@@ -26,10 +26,6 @@ description = '''
-     https://github.com/meejah/txtorcon
- '''
- 
--sphinx_rst_files = [x for x in listdir('docs') if x[-3:] == 'rst']
--sphinx_docs = [join('docs', x) for x in sphinx_rst_files]
--sphinx_docs += [join('docs/_static', x) for x in listdir('docs/_static')]
--
- setup(
-     name='txtorcon',
-     version=__version__,
-@@ -66,22 +62,4 @@ setup(
-         "txtorcon",
-         "twisted.plugins",
-     ],
--
--    # I'm a little unclear if I'm doing this "properly", especially
--    # the documentation etc. Do we really want "share/txtorcon" for
--    # the first member of the tuple? Why does it seem I need to
--    # duplicate this in MANIFEST.in?
--
--    data_files=[
--        ('share/txtorcon', ['INSTALL', 'README.rst', 'TODO', 'meejah.asc']),
--
--        # this includes the Sphinx source for the
--        # docs. The "map+filter" construct grabs all .rst
--        # files and re-maps the path
--        ('share/txtorcon', [
--            'docs/apilinks_sphinxext.py',
--            'docs/conf.py',
--            'docs/Makefile',
--        ] + sphinx_docs),
--    ],
- )
--- 
-2.14.1
-
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch
deleted file mode 100644
index 0cc50141ed28..000000000000
--- a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3e7f764b18b1f630a23e71db9ca8f7c2e6e8210b Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 19 Sep 2017 15:06:28 -0700
-Subject: [PATCH] setup.py: Remove unconditional examples from data files
- install
-
----
- setup.py | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index d5f8016..3020112 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,6 @@ description = '''
- sphinx_rst_files = [x for x in listdir('docs') if x[-3:] == 'rst']
- sphinx_docs = [join('docs', x) for x in sphinx_rst_files]
- sphinx_docs += [join('docs/_static', x) for x in listdir('docs/_static')]
--examples = [x for x in listdir('examples') if x[-3:] == '.py']
- 
- setup(
-     name='txtorcon',
-@@ -84,8 +83,5 @@ setup(
-             'docs/conf.py',
-             'docs/Makefile',
-         ] + sphinx_docs),
--
--        # include all the examples
--        ('share/txtorcon/examples', [join('examples', x) for x in examples])
-     ],
- )
--- 
-2.14.1
-
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch
deleted file mode 100644
index 0cf86fe74fbc..000000000000
--- a/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f407d11f3d4951c301fd47df211f0d93d107b8d1 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 19 Sep 2017 11:49:14 -0700
-Subject: [PATCH] setup.py: Don't install the tests
-
-This was installing the tests to its own namespace, not under the txtorcon namespace.
-If you want the tests installed, then move them under the txtorcon namespace.
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 38c6421..d5f8016 100644
---- a/setup.py
-+++ b/setup.py
-@@ -64,7 +64,6 @@ setup(
-     url=__url__,
-     license=__license__,
-     packages=[
--        "test",
-         "txtorcon",
-         "twisted.plugins",
-     ],
--- 
-2.14.1
-
diff --git a/dev-python/txtorcon/metadata.xml b/dev-python/txtorcon/metadata.xml
deleted file mode 100644
index 43897ef848d6..000000000000
--- a/dev-python/txtorcon/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>meejah@meejah.ca</email>
-			<name>meejah</name>
-		</maintainer>
-		<remote-id type="pypi">txtorcon</remote-id>
-		<remote-id type="github">meejah/txtorcon</remote-id>
-	</upstream>
-	<longdescription>
-		txtorcon is an implementation of the control-spec for Tor using the
-		Twisted networking library for Python.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
deleted file mode 100644
index 44b5ad81aa0f..000000000000
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ /dev/null
@@ -1,63 +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="Twisted-based Tor controller client, with state-tracking and config abstractions"
-HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon/ https://txtorcon.readthedocs.org"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/automat[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP},crypt]
-	>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/automat[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
-		>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch"
-	"${FILESDIR}/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch"
-	"${FILESDIR}/txtorcon-0.19.3-Removeunconditionalexamples.patch"
-	"${FILESDIR}/txtorcon-0.19.3-Removeinstalldocs.patch"
-)
-
-python_prepare_all() {
-	sed -e "s/^ipaddress.*//" -i requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-python_test() {
-	pushd "${TEST_DIR}" > /dev/null || die
-	/usr/bin/trial txtorcon || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && dohtml -r "${S}/docs/_build/html/"*
-	use examples && dodoc -r "${S}/examples/"
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/txtorcon/txtorcon-20.0.0.ebuild b/dev-python/txtorcon/txtorcon-20.0.0.ebuild
deleted file mode 100644
index d06852d8f77d..000000000000
--- a/dev-python/txtorcon/txtorcon-20.0.0.ebuild
+++ /dev/null
@@ -1,66 +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 distutils-r1
-
-DESCRIPTION="Twisted-based Tor controller client, with state-tracking and config abstractions"
-HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon/ https://txtorcon.readthedocs.org"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/automat[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP},crypt]
-	>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/automat[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
-		>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch"
-	"${FILESDIR}/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch"
-	"${FILESDIR}/txtorcon-0.19.3-Removeunconditionalexamples.patch"
-)
-
-python_prepare_all() {
-	sed -e "s/^ipaddress.*//" -i requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-python_test() {
-	pushd "${TEST_DIR}" > /dev/null || die
-	/usr/bin/trial txtorcon || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && dodoc -r "${S}/docs/_build/html/"*
-	use examples && dodoc -r "${S}/examples/"
-	distutils-r1_python_install_all
-
-	# delete the dropin.cache so we don't have collisions
-	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache || die
-}
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index fc16bb58a927..9019a021ca0a 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 560 BLAKE2B 9d7796a0ac73eac0abf92cea857176ba95a0744b4c4cac7bd13f8e1e6f395cf9bde8f0faafa5cf3e53b4dc323b2feda27c0bc679161a2673a53100ee1a22d6ad SHA512 7fc00394894e31b51b87be719efb452ffea6f6b57b15381307007e698ad105ed67d494d6a3500fb06781f3daab566ce6da8050b8e5a9fccd3d4b75513a29bdf6
+EBUILD typed-ast-1.4.1.ebuild 562 BLAKE2B 24e63e1ecdec2e2bbb398f4c343500bee8e50dbcf73d82010c9288d6beaf6250db54561c7854d74371b5763f15cefceedbd8eda35eb8db366981ce59c2fe745e SHA512 f7b44b48c046d4cc8d6a4317b66756fb72134e2675d92c15bce1a56b314b4f4609f414381a77b02936b3e4339d9ba1ad368aced29f6f7c3accf1a9e23e234a04
 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 cfa76a21bd2d..d667c9b90a4e 100644
--- a/dev-python/typed-ast/typed-ast-1.4.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python typed-ast backported"
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 6280ba3f1691..ca1503acce15 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,3 +1,4 @@
-DIST vdirsyncer-0.16.7.tar.gz 112786 BLAKE2B 19b9ce6e3e9de0a626b9562b4d54b270c1532d93169fe2d872f15c6bf6e1ac94bc623c171e51e871082422116636b4945b58dd172cfca527a010906737f1b6a3 SHA512 218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e
-EBUILD vdirsyncer-0.16.7.ebuild 1504 BLAKE2B 8d470895fa0128ff82932bbce9c3761d6064bb399ac6deb84ce7b23e8efb1f3e281d08dd293797d7a88a772852a56f4cb8883ab86db0fc0c04e07e9ca4f27e58 SHA512 0d0ee5dfb988d2adcff9feb6d14a3c3743d36bd101527e3500f4b5fcfcf4f959c9bfd3df6eb8a54e97ac4e89f06facff9124133767cc69e8c3062e1414ab04b6
+AUX vdirsyncer-0.16.8-click-7-compat.patch 1192 BLAKE2B 33dd29de4c8497977a11052e4dc98290a981f470bdcd936f7dfc57e61a408332317805edbb0ecf50fdeb6256b91ece21f3b9582748cc5dc63cc687a68e9ecae1 SHA512 3de4131b447f789da4ae0da99f7f9f2d62dfb37b01b68db5b1c2ea68477425038681b4428024c3d743e18e2f0c3a069552066ff8743b85d2ce9bb31a4e850e9f
+DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
+EBUILD vdirsyncer-0.16.8.ebuild 1466 BLAKE2B 2b2f4962c20c711b924bea9112342138a11cb0d1cca89658b16b9ab58d8319f8be7bad4f07b767768c9a78c7ac93c3de37d37dd3db00616ccb62c63115a11988 SHA512 36ae629d991d7e4d670dc04f951b57eb3157fb5ea30b04f41f429f6b044fccc441eb66c724ec3bb1f6707c5a3da773d57013f077c08dff2d8eaef0d33c5a6571
 MISC metadata.xml 349 BLAKE2B 20ad2ded190f80b37283e6ef064168094e9edeec5ca6ba262e9e6d977bd28d1538056b21efa7fecc090b63424a23f87c54ec1e2e2dcd02a2f4c5ab7b4b82abe1 SHA512 5e2d7f27428065740bdee11e59053519c83054c19156f77ec03fc6e416ca44ea0b74178844ac8ef84d1993927bcf3ba0b80d84296a152a006681ed77e87ed14f
diff --git a/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch b/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
new file mode 100644
index 000000000000..c0ee62f959f9
--- /dev/null
+++ b/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
@@ -0,0 +1,35 @@
+commit 3eb9ce5ae4320d52e6c876874511ff96a8a45f51
+Author: Hugo Osvaldo Barrera <hugo@barrera.io>
+Date:   Tue Jun 9 14:45:02 2020 +0200
+
+    Add compatibility with latest click
+
+diff --git a/setup.py b/setup.py
+index 59549f16842a..d584b95dd297 100644
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ from setuptools import setup
+ 
+ requirements = [
+     # https://github.com/mitsuhiko/click/issues/200
+-    'click>=5.0,<6.0',
++    'click>=5.0',
+     'click-log>=0.3.0, <0.4.0',
+ 
+     # https://github.com/pimutils/vdirsyncer/issues/478
+diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
+index f242376417f3..43d35dd8541e 100644
+--- a/tests/system/cli/test_sync.py
++++ b/tests/system/cli/test_sync.py
+@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
+     runner.write_with_general('')
+     result = runner.invoke(['--verbosity=HAHA', 'sync'])
+     assert result.exception
+-    assert 'invalid value for "--verbosity"' in result.output.lower()
++    assert (
++        'invalid value for "--verbosity"' in result.output.lower()
++        or "invalid value for '--verbosity'" in result.output.lower()
++    )
+ 
+ 
+ def test_collections_cache_invalidation(tmpdir, runner):
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.8.ebuild
index 2a312ce64647..eba73bc32ea9 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.8.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -12,32 +13,31 @@ DESCRIPTION="Synchronize calendars and contacts"
 HOMEPAGE="https://github.com/pimutils/vdirsyncer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-click-7-compat.patch" )
 
 RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
 	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
 	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="${RDEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.0.0[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
 		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
 	)"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
 
+distutils_enable_tests pytest
+
 python_test() {
 	# skip tests needing servers running
 	local -x DAV_SERVER=skip
@@ -45,5 +45,5 @@ python_test() {
 	# pytest dies hard if the envvars do not have any value...
 	local -x CI=false
 	local -x DETERMINISTIC_TESTS=false
-	py.test -v || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 9ecfee816058..73e2ee113ce5 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -8,9 +8,11 @@ DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecd
 DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
 DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
 DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
+DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
 EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
 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 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
+EBUILD virtualenv-20.0.23.ebuild 2553 BLAKE2B 21b38ed667cb8ddd602e1e046bd793cafa8362bcfd17898762f7bcdf01bdbc8d37cf63c42e5c62b83388137caf13bcf3fbdf41dfea95e1d6ed72a36fcf9b7026 SHA512 4a0f8f025952fc93f8650539da26c2daa7e3c1e6b15069398fccc1258f401055f1de1cb7fbc778e8e686cb1570513cfc2d37952ff9b6d98a96fdeb6805a1902d
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.23.ebuild b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
new file mode 100644
index 000000000000..a7fac541d104
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
@@ -0,0 +1,90 @@
+# 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,7,8,9}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' -2 python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' -2 python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' -3)
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_prepare() {
+	# we don't have xonsh
+	rm tests/unit/activation/test_xonsh.py || die
+	# require internet
+	sed -e 's:test_seed_link_via_app_data:_&:' \
+		-i tests/unit/seed/test_boostrap_link_via_app_data.py || die
+	# TODO: investigate
+	sed -e 's:test_cross_major:_&:' \
+		-i tests/unit/create/test_creator.py || die
+	sed -e 's:test_py_info_to_system_raises:_&:' \
+		-i tests/unit/discovery/py_info/test_py_info.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	# TODO: fix/skip with more granularity tests on pypy3
+	if has "${EPYTHON}" pypy3 python2.7; then
+		einfo "Skipping broken tests on pypy3"
+		continue
+	fi
+
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 027a3bcb1a7f..7303b024a510 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,7 +1,5 @@
-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.3.ebuild 579 BLAKE2B d3b5bc9b454dae714b1dc0e602016a051c3b7f82ade431153fef929edabeb6abdcbac0ca87ca59452ad27d9d4c79099c3286d1d35db0a87e764b8c53f4cc4f14 SHA512 136f1fcd0acca762d447f5b33113f6adc33ac5ee64ab2fcaf13a8aabe0ada16ff5120414732f0fcfbbe31bcee6b95c6c69f58ac1dfad3a2cdc4c9f4aa0d9bbe2
 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.3.1.ebuild b/dev-python/waitress/waitress-1.3.1.ebuild
deleted file mode 100644
index a9f728fecfbe..000000000000
--- a/dev-python/waitress/waitress-1.3.1.ebuild
+++ /dev/null
@@ -1,21 +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=( 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 nose
diff --git a/dev-python/waitress/waitress-1.4.3.ebuild b/dev-python/waitress/waitress-1.4.3.ebuild
index 89ea22c17d6d..a9f728fecfbe 100644
--- a/dev-python/waitress/waitress-1.4.3.ebuild
+++ b/dev-python/waitress/waitress-1.4.3.ebuild
@@ -16,6 +16,6 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 76e6199ffea2..a0949d39416e 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,9 @@
 DIST xmlschema-1.1.3.tar.gz 298490 BLAKE2B 70c24424fd6a5e87e07591451db920d22c1bf2c63c1908e008401eafe210b759894ba508011ee58e2c242ca5b3d424c86cdf7a65312e9df1cda426802af8e861 SHA512 df277cd75058e10b8e0505db51fc167c688fe4c3d319de289ac77faa37913f60d2697f4456e00d637c4a3c3f83d164619e0ce1b849e8c8ea3b5e1932b56044dc
 DIST xmlschema-1.2.0.tar.gz 314580 BLAKE2B d42b221d2730d2b5cdab655269f7b885c72bce1794f12111b4110a80a1288e1996633ef5f00e9fc3ef7cd66a4267baffbdb6a906d0a0c3caf418d31abda93016 SHA512 1a6644b02e96beeea68bd737a4a66fd02693b4cb3c36a07e569a2b2c3e2b0db4fe01a475fcc3c4e5372c6000b27ef824ba5859215a03212fe4c0f2ec61f7103b
 DIST xmlschema-1.2.1.tar.gz 318674 BLAKE2B 686b94846b9cc8bc3dabfea9c9171a186561a0ad568a2806f5575a0c5808d3542f4e2cb7c01096036f5a54fb839cbdd95077fee9febad4cd7a82ead445228e62 SHA512 6d27ea5aea227e35f25a34a651b27084844bca015ae60d096fe1879150efb681141c368cd38cf376a2f0ea28b265cb844f1de82d2d7f704e3c2db67683f2af9b
+DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
 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
+EBUILD xmlschema-1.2.2.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.2.2.ebuild b/dev-python/xmlschema/xmlschema-1.2.2.ebuild
new file mode 100644
index 000000000000..e6e1d1a243d4
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.2.2.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/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 0c63a9d6898d..60d967b28d3e 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 1062 BLAKE2B 2256cead258e116969e0a4488a3fcc9e1ba8836d6eae77a5ee2704733f246fd2233de05db5337fb2f4eceb7d50d8620244847d90c561d166c69a9df9fe3155ee SHA512 26a41ed98fce65236b752aa02bebfc4e4345b99eb490b8fa25188f254fafc60b9b4be06326426e29bb4fd2eca43a2d32dac378a46ac53322ce7046252665122d
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD zc-lockfile-2.0.ebuild 1060 BLAKE2B 5bab1e261f91fbdf8b3a8f6e97fe77e170d7307d51b40cc24df9ac3e444ca9fa96704e147b26aaa2979366c2b0592a0c930622d6a4beb035c078d1f0e9161192 SHA512 a8fbf3bf6f2e5bcc632b69f9e7b50662b9614c8e4235ae67ac7e1070c938c10a263b993814d1fe79efb3026895c262c1db5aeb8c694cc79b5a1f368e7a8e1e80
+MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/zc-lockfile/metadata.xml b/dev-python/zc-lockfile/metadata.xml
index c36c37139fad..9f8e145958a9 100644
--- a/dev-python/zc-lockfile/metadata.xml
+++ b/dev-python/zc-lockfile/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 3ec50a9d0706..048092af73c0 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-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} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 136efb0fa39c..0366b2a6a50a 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,3 +1,3 @@
 DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-EBUILD zope-testing-4.7-r1.ebuild 995 BLAKE2B 9af8902a03bf99770a5b420d6990191b0712fc0a62e15e65add2b237eb600f4a3d31ef0e2213e539b601b212d0a8f9414d4943805378a26a84a6a63db8740ff3 SHA512 f02698f5ef1b374702108391f6866298b056af8f56cdb2697fecfd76a1cd91b0dbaa79845dd067d624992a0a4607b10721ea3eac9717d428019852c5b3ae4d09
+EBUILD zope-testing-4.7-r1.ebuild 994 BLAKE2B 9b294a6ed8e9ebddf17fac26862a2172dd9fbc09cfc3b0afba05837a17ab10fb92a2aee95dfc96e72f82edee8920846d5c8805722f8f82a91b4d0aef1acb5322 SHA512 3d7fdd38b6a18558715a078bb544240fc2aedeff433ef3ff09ba21c014f980c10954a1a6a84fda52c157444c56c8351cba4cf2e0c7f4765f85873390166a799a
 MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
diff --git a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
index 3a8a22c97b9b..af8fdf5e136f 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index e94f12c8da42..59f3580b0c51 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,8 +1,10 @@
 AUX zstandard-0.13.0-compiler.patch 770 BLAKE2B 43ef34c46cf54d5e872c74a12870a3dfba561ea1e91aa0b950dfcdd5f08d68c4a8dceaac3617dd2aa9fd4f05c1c3a556c194c37863bb1dea46e8bd289d35a0f2 SHA512 83eed984669604d84a597c93a86539b6768199947c9e742105fe6fd6eff667e2b738b889ca99165b50cd9b35b804fbaddcc19c15aaeeca0085452f42667631a9
 DIST zstandard-0.12.0.tar.gz 648827 BLAKE2B bb644150e4126997d447dad3e5aec9f6e15ee344366634772d75b246a9ab82fad13f85ce986f36e45331fff26449b05a0864ad77d949def8cb024f598a218c74 SHA512 ebf896a77ce5cdc82a1edb658a0b96bcf99deee7aa031163879fc21fe3d03623061182fd2c11840a5a46a8ad0a08b98b802b4703b963d448a25c0b52685d3b64
 DIST zstandard-0.13.0.tar.gz 659422 BLAKE2B 8ebdb7f7ca1671fa87cc1bb8a67cde4f408c49b9146041ca2a713a1457d9a4acfed5335484294d61b076f4a8e42ab3b2bcd0d09b4af54fca3a82a511c73d6d83 SHA512 3a6151de640515f21626d150e1295c1f2e524d377b3b1ccabf2719fae6da89f95480a50ec80eac4d07d317c7abe50ed7a26162b3291169e139c4ddd71b6ada98
+DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.12.0.ebuild 859 BLAKE2B 97e7550806562e05879ba14d5fd2794d2b24607b87c8bfc582bd405740c7843a4e1a23802bdf23020662ac4e7931778819771be6ecab6ff5c5b5cb83c11e4ff2 SHA512 3bfd23c6f6ebea1c12ef618449915e6103f2b304a92e8ee56707d8938d5542482a6d4a35baac041c7884c348fd41047033ccb21fc181f89dcefa80a9dd07f2da
 EBUILD zstandard-0.13.0.ebuild 909 BLAKE2B b6c7d84d886f4eb8307fc56cabd8d75ed14ecd46b65d483beccd816f7a8e161654acd56391c5669bc887b3e0a65416f92975285e340884530c45aeab0ff69619 SHA512 e624b56e8a256cd7a8e1c46bd30e8c1d698a99afe018a3b73d24d30016a2ddaf2f59a3e974a4f017ce3d5db618eb153c680ea84a74814dff77f362f0d8ab88f5
+EBUILD zstandard-0.14.0.ebuild 793 BLAKE2B 6a63f401ac51fe0fe6f31708537d0b0f2643ea4ad7a5d4da38f78505f16904d1b84fae02a2e9d1d57e4c5485f891c874567dab128b625551ebfe9294b70ba9a8 SHA512 290d5ff040365afcf0b7069a1e1d565701dacfe6346105a1ab34637798f16e438116e0ecc97670ce856186e12ffac38ec63068b753af6671b98b7dbb4a29362d
 EBUILD zstandard-0.8.1.ebuild 664 BLAKE2B 1b8903a1d059e9e3f8a903784a03658d733fb55648acd4c9b5fa49e89e49898263a48b77c38ef38d50612102b8d7cf46ff140b28ffa14890be691baeed24e4f5 SHA512 b8da1b96c32dda93794ee527971e607500097b8227f0e9cbb5dfac03ee4ed6a81846b60f88a295f31753bfad5d913adf49831bf61d946362ad4b54040e829c56
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.14.0.ebuild b/dev-python/zstandard/zstandard-0.14.0.ebuild
new file mode 100644
index 000000000000..2f9ab74169ae
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# 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}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /dev-python
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)